diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 1c6231e..f80d0c5 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -86,7 +86,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" props="comments">
+          <el-form-item label="请输入退回原因" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 1c6231e..f80d0c5 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -86,7 +86,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" props="comments">
+          <el-form-item label="请输入退回原因" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
new file mode 100644
index 0000000..ef91bfd
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -0,0 +1,37 @@
+// 列表查询接口
+export interface IListQuery {
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  manufacturingNo: string	// 出厂编号
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  offset: number // 当前页
+  limit: number // 每页多少条
+}
+
+// 表格
+export interface IList {
+  id: string // 主键
+  originalRecordCode: string	// 原始记录单编号
+  originalRecordName: string // 原始记录名称
+  customerSampleInfo: { // 样品信息
+    sampleNo: string	// 样品编号
+    sampleName: string	// 样品名称
+    manufacturingNo: string	// 出厂编号
+    sampleModel: string // 样品型号
+  }
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  createTime: string // 创建时间
+  remark: string // 备注
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
+

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 1c6231e..f80d0c5 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -86,7 +86,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" props="comments">
+          <el-form-item label="请输入退回原因" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
new file mode 100644
index 0000000..ef91bfd
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -0,0 +1,37 @@
+// 列表查询接口
+export interface IListQuery {
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  manufacturingNo: string	// 出厂编号
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  offset: number // 当前页
+  limit: number // 每页多少条
+}
+
+// 表格
+export interface IList {
+  id: string // 主键
+  originalRecordCode: string	// 原始记录单编号
+  originalRecordName: string // 原始记录名称
+  customerSampleInfo: { // 样品信息
+    sampleNo: string	// 样品编号
+    sampleName: string	// 样品名称
+    manufacturingNo: string	// 出厂编号
+    sampleModel: string // 样品型号
+  }
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  createTime: string // 创建时间
+  remark: string // 备注
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 48dd59c..98c4257 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -1,72 +1,78 @@
-<script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+<!-- 原始记录列表 -->
+<script lang="ts" setup name="PrimitiveLogList">
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import QrDialog from '@/components/QrDialog/index.vue'
+import type { IList, IListQuery, dictType } from './primitiveLogList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '', // 创建结束时间
-  createStartTime: '', // 创建开始时间
-  deptId: '', // 部门id
-  director: '', // 负责人
-  effectiveCompany: '', // 原始记录编号
-  ids: [], // 导出集合
-  trainEndTime: '', // 结束时间
-  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  trainStartTime: '', // 开始时间
-  testCategory: '', // 检测类别
+import { getDictByCode } from '@/api/system/dict'
+
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+// 查询条件
+const listQuery = ref<IListQuery>({
+  calibrationCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 多选选中
 const checkoutList = ref<string[]>([])
-const list = ref([]) // 数据列表
+const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
 
-const $router = useRouter()
+// 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = []
-  loadingTable.value = false
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name, // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
 }
-fetchData(true)
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
-const { proxy } = getCurrentInstance() as any
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
-  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
-  { text: '样品编号', value: 'text', align: 'center' },
-  { text: '样品名称', value: 'text', align: 'center' },
-  { text: '出厂编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '检校类别', value: 'text', align: 'center' },
-  { text: '创建人', value: 'text', align: 'center' },
-  { text: '创建时间', value: 'text', align: 'center' },
-  { text: '备注', value: 'text', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -75,53 +81,59 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '', // 创建结束时间
-    createStartTime: '', // 创建开始时间
-    deptId: '', // 部门id
-    director: '', // 负责人
-    effectiveCompany: '', // 原始记录编号
-    ids: [], // 导出集合
-    trainEndTime: '', // 结束时间
-    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    trainStartTime: '', // 开始时间
-    testCategory: '', // 检测类别
+    calibrationCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
-  trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      calibrationCategory: '',	// 校验类别
+      createUser: '',	// 创建人
+      manufacturingNo: '',	// 出厂编号
+      originalRecordCode: '',	// 原始记录单编号
+      sampleModel: '',	// 样品型号
+      sampleName: '',	// 样品名称
+      sampleNo: '',	// 样品编号
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    exportPrimitiveLogList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '原始记录列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  text: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IList, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/primitiveLogList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
-    `确认删除${row.text}吗？`,
+    `确认删除${row.originalRecordName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -130,28 +142,25 @@
     },
   )
     .then(() => {
-      // getListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      deletePrimitiveLogList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已删除')
+          fetchData(true)
+        }
+      })
     })
 }
 
-const handelClick = (text: string) => {}
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
+// 点击新建
 const add = () => {
   $router.push('/lab/primitiveLogList/add')
 }
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -162,6 +171,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -172,16 +182,21 @@
     }
   })
   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 => checkoutList.value.includes(item))
-    printJSON(printList, properties, '环境记录单列表')
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '原始记录单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
+})
 </script>
 
 <template>
@@ -189,57 +204,57 @@
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.effectiveCompany"
+          v-model.trim="listQuery.originalRecordCode"
           placeholder="原始记录编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.manufacturingNo"
           placeholder="出厂编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleModel"
           placeholder="型号"
           clearable
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.testCategory"
+          v-model="listQuery.calibrationCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
         >
           <el-option
-            v-for="item in testCategoryList"
-            :key="item.id"
+            v-for="item in mesureCategoryList"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"
+            :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.createUser"
           placeholder="创建人"
           clearable
         />
@@ -280,10 +295,10 @@
         @multiSelect="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/edit')"
                 size="small"
                 type="primary"
                 link
@@ -300,11 +315,11 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/delete')"
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 1c6231e..f80d0c5 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -86,7 +86,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" props="comments">
+          <el-form-item label="请输入退回原因" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
new file mode 100644
index 0000000..ef91bfd
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -0,0 +1,37 @@
+// 列表查询接口
+export interface IListQuery {
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  manufacturingNo: string	// 出厂编号
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  offset: number // 当前页
+  limit: number // 每页多少条
+}
+
+// 表格
+export interface IList {
+  id: string // 主键
+  originalRecordCode: string	// 原始记录单编号
+  originalRecordName: string // 原始记录名称
+  customerSampleInfo: { // 样品信息
+    sampleNo: string	// 样品编号
+    sampleName: string	// 样品名称
+    manufacturingNo: string	// 出厂编号
+    sampleModel: string // 样品型号
+  }
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  createTime: string // 创建时间
+  remark: string // 备注
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 48dd59c..98c4257 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -1,72 +1,78 @@
-<script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+<!-- 原始记录列表 -->
+<script lang="ts" setup name="PrimitiveLogList">
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import QrDialog from '@/components/QrDialog/index.vue'
+import type { IList, IListQuery, dictType } from './primitiveLogList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '', // 创建结束时间
-  createStartTime: '', // 创建开始时间
-  deptId: '', // 部门id
-  director: '', // 负责人
-  effectiveCompany: '', // 原始记录编号
-  ids: [], // 导出集合
-  trainEndTime: '', // 结束时间
-  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  trainStartTime: '', // 开始时间
-  testCategory: '', // 检测类别
+import { getDictByCode } from '@/api/system/dict'
+
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+// 查询条件
+const listQuery = ref<IListQuery>({
+  calibrationCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 多选选中
 const checkoutList = ref<string[]>([])
-const list = ref([]) // 数据列表
+const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
 
-const $router = useRouter()
+// 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = []
-  loadingTable.value = false
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name, // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
 }
-fetchData(true)
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
-const { proxy } = getCurrentInstance() as any
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
-  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
-  { text: '样品编号', value: 'text', align: 'center' },
-  { text: '样品名称', value: 'text', align: 'center' },
-  { text: '出厂编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '检校类别', value: 'text', align: 'center' },
-  { text: '创建人', value: 'text', align: 'center' },
-  { text: '创建时间', value: 'text', align: 'center' },
-  { text: '备注', value: 'text', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -75,53 +81,59 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '', // 创建结束时间
-    createStartTime: '', // 创建开始时间
-    deptId: '', // 部门id
-    director: '', // 负责人
-    effectiveCompany: '', // 原始记录编号
-    ids: [], // 导出集合
-    trainEndTime: '', // 结束时间
-    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    trainStartTime: '', // 开始时间
-    testCategory: '', // 检测类别
+    calibrationCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
-  trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      calibrationCategory: '',	// 校验类别
+      createUser: '',	// 创建人
+      manufacturingNo: '',	// 出厂编号
+      originalRecordCode: '',	// 原始记录单编号
+      sampleModel: '',	// 样品型号
+      sampleName: '',	// 样品名称
+      sampleNo: '',	// 样品编号
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    exportPrimitiveLogList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '原始记录列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  text: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IList, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/primitiveLogList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
-    `确认删除${row.text}吗？`,
+    `确认删除${row.originalRecordName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -130,28 +142,25 @@
     },
   )
     .then(() => {
-      // getListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      deletePrimitiveLogList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已删除')
+          fetchData(true)
+        }
+      })
     })
 }
 
-const handelClick = (text: string) => {}
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
+// 点击新建
 const add = () => {
   $router.push('/lab/primitiveLogList/add')
 }
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -162,6 +171,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -172,16 +182,21 @@
     }
   })
   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 => checkoutList.value.includes(item))
-    printJSON(printList, properties, '环境记录单列表')
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '原始记录单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
+})
 </script>
 
 <template>
@@ -189,57 +204,57 @@
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.effectiveCompany"
+          v-model.trim="listQuery.originalRecordCode"
           placeholder="原始记录编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.manufacturingNo"
           placeholder="出厂编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleModel"
           placeholder="型号"
           clearable
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.testCategory"
+          v-model="listQuery.calibrationCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
         >
           <el-option
-            v-for="item in testCategoryList"
-            :key="item.id"
+            v-for="item in mesureCategoryList"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"
+            :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.createUser"
           placeholder="创建人"
           clearable
         />
@@ -280,10 +295,10 @@
         @multiSelect="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/edit')"
                 size="small"
                 type="primary"
                 link
@@ -300,11 +315,11 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/delete')"
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c74b7dd..cd53837 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="EnvironmentalAdd">
+<script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -644,7 +644,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择检校时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -869,7 +869,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -883,7 +883,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 1c6231e..f80d0c5 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -86,7 +86,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" props="comments">
+          <el-form-item label="请输入退回原因" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
new file mode 100644
index 0000000..ef91bfd
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -0,0 +1,37 @@
+// 列表查询接口
+export interface IListQuery {
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  manufacturingNo: string	// 出厂编号
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  offset: number // 当前页
+  limit: number // 每页多少条
+}
+
+// 表格
+export interface IList {
+  id: string // 主键
+  originalRecordCode: string	// 原始记录单编号
+  originalRecordName: string // 原始记录名称
+  customerSampleInfo: { // 样品信息
+    sampleNo: string	// 样品编号
+    sampleName: string	// 样品名称
+    manufacturingNo: string	// 出厂编号
+    sampleModel: string // 样品型号
+  }
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  createTime: string // 创建时间
+  remark: string // 备注
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 48dd59c..98c4257 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -1,72 +1,78 @@
-<script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+<!-- 原始记录列表 -->
+<script lang="ts" setup name="PrimitiveLogList">
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import QrDialog from '@/components/QrDialog/index.vue'
+import type { IList, IListQuery, dictType } from './primitiveLogList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '', // 创建结束时间
-  createStartTime: '', // 创建开始时间
-  deptId: '', // 部门id
-  director: '', // 负责人
-  effectiveCompany: '', // 原始记录编号
-  ids: [], // 导出集合
-  trainEndTime: '', // 结束时间
-  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  trainStartTime: '', // 开始时间
-  testCategory: '', // 检测类别
+import { getDictByCode } from '@/api/system/dict'
+
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+// 查询条件
+const listQuery = ref<IListQuery>({
+  calibrationCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 多选选中
 const checkoutList = ref<string[]>([])
-const list = ref([]) // 数据列表
+const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
 
-const $router = useRouter()
+// 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = []
-  loadingTable.value = false
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name, // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
 }
-fetchData(true)
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
-const { proxy } = getCurrentInstance() as any
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
-  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
-  { text: '样品编号', value: 'text', align: 'center' },
-  { text: '样品名称', value: 'text', align: 'center' },
-  { text: '出厂编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '检校类别', value: 'text', align: 'center' },
-  { text: '创建人', value: 'text', align: 'center' },
-  { text: '创建时间', value: 'text', align: 'center' },
-  { text: '备注', value: 'text', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -75,53 +81,59 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '', // 创建结束时间
-    createStartTime: '', // 创建开始时间
-    deptId: '', // 部门id
-    director: '', // 负责人
-    effectiveCompany: '', // 原始记录编号
-    ids: [], // 导出集合
-    trainEndTime: '', // 结束时间
-    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    trainStartTime: '', // 开始时间
-    testCategory: '', // 检测类别
+    calibrationCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
-  trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      calibrationCategory: '',	// 校验类别
+      createUser: '',	// 创建人
+      manufacturingNo: '',	// 出厂编号
+      originalRecordCode: '',	// 原始记录单编号
+      sampleModel: '',	// 样品型号
+      sampleName: '',	// 样品名称
+      sampleNo: '',	// 样品编号
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    exportPrimitiveLogList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '原始记录列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  text: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IList, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/primitiveLogList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
-    `确认删除${row.text}吗？`,
+    `确认删除${row.originalRecordName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -130,28 +142,25 @@
     },
   )
     .then(() => {
-      // getListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      deletePrimitiveLogList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已删除')
+          fetchData(true)
+        }
+      })
     })
 }
 
-const handelClick = (text: string) => {}
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
+// 点击新建
 const add = () => {
   $router.push('/lab/primitiveLogList/add')
 }
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -162,6 +171,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -172,16 +182,21 @@
     }
   })
   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 => checkoutList.value.includes(item))
-    printJSON(printList, properties, '环境记录单列表')
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '原始记录单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
+})
 </script>
 
 <template>
@@ -189,57 +204,57 @@
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.effectiveCompany"
+          v-model.trim="listQuery.originalRecordCode"
           placeholder="原始记录编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.manufacturingNo"
           placeholder="出厂编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleModel"
           placeholder="型号"
           clearable
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.testCategory"
+          v-model="listQuery.calibrationCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
         >
           <el-option
-            v-for="item in testCategoryList"
-            :key="item.id"
+            v-for="item in mesureCategoryList"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"
+            :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.createUser"
           placeholder="创建人"
           clearable
         />
@@ -280,10 +295,10 @@
         @multiSelect="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/edit')"
                 size="small"
                 type="primary"
                 link
@@ -300,11 +315,11 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/delete')"
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c74b7dd..cd53837 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="EnvironmentalAdd">
+<script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -644,7 +644,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择检校时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -869,7 +869,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -883,7 +883,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
new file mode 100644
index 0000000..d5f85a0
--- /dev/null
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -0,0 +1,113 @@
+<!-- 终止操作 -->
+<script lang="ts" setup name="teminateDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import { interchangeListTerminate } from '../../../../api/business/schedule/interchangeList'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const formData = ref({
+  orderId: '', // 委托书id
+  reason: '', // 终止原因
+  sampleId: '', // 样品id
+  status: '5', // 样品状态
+})
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules = reactive<FormRules>({
+  reason: [{ required: true, message: '终止原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param orderId 委托书id
+ * @param sampleId 样品id
+ */
+function initDialog(row) {
+  // dataFormRef.value!.clearValidate()
+  formData.value.orderId = row.orderId
+  formData.value.sampleId = row.sampleId
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      // ElMessageBox.confirm(
+      //   '确认终止吗？',
+      //   '提示',
+      //   { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      // ).then(() => {
+      btnLoading.value = true
+      interchangeListTerminate(formData.value).then((res) => {
+        ElMessage.success('操作成功')
+        btnLoading.value = false
+        dialogVisible.value = false
+        emit('onSuccess')
+      }).catch((_) => {
+        btnLoading.value = false
+      })
+      // })
+    }
+  })
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="终止"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="请输入终止原因" prop="reason">
+            <el-input
+              v-model="formData.reason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm(dataFormRef)">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 1c6231e..f80d0c5 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -86,7 +86,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" props="comments">
+          <el-form-item label="请输入退回原因" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
new file mode 100644
index 0000000..ef91bfd
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -0,0 +1,37 @@
+// 列表查询接口
+export interface IListQuery {
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  manufacturingNo: string	// 出厂编号
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  offset: number // 当前页
+  limit: number // 每页多少条
+}
+
+// 表格
+export interface IList {
+  id: string // 主键
+  originalRecordCode: string	// 原始记录单编号
+  originalRecordName: string // 原始记录名称
+  customerSampleInfo: { // 样品信息
+    sampleNo: string	// 样品编号
+    sampleName: string	// 样品名称
+    manufacturingNo: string	// 出厂编号
+    sampleModel: string // 样品型号
+  }
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  createTime: string // 创建时间
+  remark: string // 备注
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 48dd59c..98c4257 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -1,72 +1,78 @@
-<script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+<!-- 原始记录列表 -->
+<script lang="ts" setup name="PrimitiveLogList">
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import QrDialog from '@/components/QrDialog/index.vue'
+import type { IList, IListQuery, dictType } from './primitiveLogList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '', // 创建结束时间
-  createStartTime: '', // 创建开始时间
-  deptId: '', // 部门id
-  director: '', // 负责人
-  effectiveCompany: '', // 原始记录编号
-  ids: [], // 导出集合
-  trainEndTime: '', // 结束时间
-  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  trainStartTime: '', // 开始时间
-  testCategory: '', // 检测类别
+import { getDictByCode } from '@/api/system/dict'
+
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+// 查询条件
+const listQuery = ref<IListQuery>({
+  calibrationCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 多选选中
 const checkoutList = ref<string[]>([])
-const list = ref([]) // 数据列表
+const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
 
-const $router = useRouter()
+// 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = []
-  loadingTable.value = false
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name, // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
 }
-fetchData(true)
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
-const { proxy } = getCurrentInstance() as any
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
-  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
-  { text: '样品编号', value: 'text', align: 'center' },
-  { text: '样品名称', value: 'text', align: 'center' },
-  { text: '出厂编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '检校类别', value: 'text', align: 'center' },
-  { text: '创建人', value: 'text', align: 'center' },
-  { text: '创建时间', value: 'text', align: 'center' },
-  { text: '备注', value: 'text', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -75,53 +81,59 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '', // 创建结束时间
-    createStartTime: '', // 创建开始时间
-    deptId: '', // 部门id
-    director: '', // 负责人
-    effectiveCompany: '', // 原始记录编号
-    ids: [], // 导出集合
-    trainEndTime: '', // 结束时间
-    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    trainStartTime: '', // 开始时间
-    testCategory: '', // 检测类别
+    calibrationCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
-  trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      calibrationCategory: '',	// 校验类别
+      createUser: '',	// 创建人
+      manufacturingNo: '',	// 出厂编号
+      originalRecordCode: '',	// 原始记录单编号
+      sampleModel: '',	// 样品型号
+      sampleName: '',	// 样品名称
+      sampleNo: '',	// 样品编号
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    exportPrimitiveLogList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '原始记录列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  text: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IList, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/primitiveLogList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
-    `确认删除${row.text}吗？`,
+    `确认删除${row.originalRecordName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -130,28 +142,25 @@
     },
   )
     .then(() => {
-      // getListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      deletePrimitiveLogList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已删除')
+          fetchData(true)
+        }
+      })
     })
 }
 
-const handelClick = (text: string) => {}
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
+// 点击新建
 const add = () => {
   $router.push('/lab/primitiveLogList/add')
 }
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -162,6 +171,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -172,16 +182,21 @@
     }
   })
   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 => checkoutList.value.includes(item))
-    printJSON(printList, properties, '环境记录单列表')
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '原始记录单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
+})
 </script>
 
 <template>
@@ -189,57 +204,57 @@
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.effectiveCompany"
+          v-model.trim="listQuery.originalRecordCode"
           placeholder="原始记录编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.manufacturingNo"
           placeholder="出厂编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleModel"
           placeholder="型号"
           clearable
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.testCategory"
+          v-model="listQuery.calibrationCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
         >
           <el-option
-            v-for="item in testCategoryList"
-            :key="item.id"
+            v-for="item in mesureCategoryList"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"
+            :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.createUser"
           placeholder="创建人"
           clearable
         />
@@ -280,10 +295,10 @@
         @multiSelect="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/edit')"
                 size="small"
                 type="primary"
                 link
@@ -300,11 +315,11 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/delete')"
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c74b7dd..cd53837 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="EnvironmentalAdd">
+<script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -644,7 +644,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择检校时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -869,7 +869,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -883,7 +883,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
new file mode 100644
index 0000000..d5f85a0
--- /dev/null
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -0,0 +1,113 @@
+<!-- 终止操作 -->
+<script lang="ts" setup name="teminateDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import { interchangeListTerminate } from '../../../../api/business/schedule/interchangeList'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const formData = ref({
+  orderId: '', // 委托书id
+  reason: '', // 终止原因
+  sampleId: '', // 样品id
+  status: '5', // 样品状态
+})
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules = reactive<FormRules>({
+  reason: [{ required: true, message: '终止原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param orderId 委托书id
+ * @param sampleId 样品id
+ */
+function initDialog(row) {
+  // dataFormRef.value!.clearValidate()
+  formData.value.orderId = row.orderId
+  formData.value.sampleId = row.sampleId
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      // ElMessageBox.confirm(
+      //   '确认终止吗？',
+      //   '提示',
+      //   { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      // ).then(() => {
+      btnLoading.value = true
+      interchangeListTerminate(formData.value).then((res) => {
+        ElMessage.success('操作成功')
+        btnLoading.value = false
+        dialogVisible.value = false
+        emit('onSuccess')
+      }).catch((_) => {
+        btnLoading.value = false
+      })
+      // })
+    }
+  })
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="终止"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="请输入终止原因" prop="reason">
+            <el-input
+              v-model="formData.reason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm(dataFormRef)">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue
deleted file mode 100644
index dc864bd..0000000
--- a/src/views/business/schedule/interchange/buttonBox.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { DefaultProps } from 'element-plus'
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-// 按钮菜单
-const menu = [
-  { name: '待收入', id: 'taking' },
-  { name: '已收入', id: 'took' },
-  { name: '待归还', id: 'returning' },
-  { name: '已归还', id: 'returned' },
-  { name: '已超期', id: 'overtime' },
-]
-const current = ref('taking')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 76px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 1c6231e..f80d0c5 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -86,7 +86,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" props="comments">
+          <el-form-item label="请输入退回原因" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
new file mode 100644
index 0000000..ef91bfd
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -0,0 +1,37 @@
+// 列表查询接口
+export interface IListQuery {
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  manufacturingNo: string	// 出厂编号
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  offset: number // 当前页
+  limit: number // 每页多少条
+}
+
+// 表格
+export interface IList {
+  id: string // 主键
+  originalRecordCode: string	// 原始记录单编号
+  originalRecordName: string // 原始记录名称
+  customerSampleInfo: { // 样品信息
+    sampleNo: string	// 样品编号
+    sampleName: string	// 样品名称
+    manufacturingNo: string	// 出厂编号
+    sampleModel: string // 样品型号
+  }
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  createTime: string // 创建时间
+  remark: string // 备注
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 48dd59c..98c4257 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -1,72 +1,78 @@
-<script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+<!-- 原始记录列表 -->
+<script lang="ts" setup name="PrimitiveLogList">
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import QrDialog from '@/components/QrDialog/index.vue'
+import type { IList, IListQuery, dictType } from './primitiveLogList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '', // 创建结束时间
-  createStartTime: '', // 创建开始时间
-  deptId: '', // 部门id
-  director: '', // 负责人
-  effectiveCompany: '', // 原始记录编号
-  ids: [], // 导出集合
-  trainEndTime: '', // 结束时间
-  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  trainStartTime: '', // 开始时间
-  testCategory: '', // 检测类别
+import { getDictByCode } from '@/api/system/dict'
+
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+// 查询条件
+const listQuery = ref<IListQuery>({
+  calibrationCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 多选选中
 const checkoutList = ref<string[]>([])
-const list = ref([]) // 数据列表
+const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
 
-const $router = useRouter()
+// 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = []
-  loadingTable.value = false
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name, // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
 }
-fetchData(true)
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
-const { proxy } = getCurrentInstance() as any
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
-  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
-  { text: '样品编号', value: 'text', align: 'center' },
-  { text: '样品名称', value: 'text', align: 'center' },
-  { text: '出厂编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '检校类别', value: 'text', align: 'center' },
-  { text: '创建人', value: 'text', align: 'center' },
-  { text: '创建时间', value: 'text', align: 'center' },
-  { text: '备注', value: 'text', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -75,53 +81,59 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '', // 创建结束时间
-    createStartTime: '', // 创建开始时间
-    deptId: '', // 部门id
-    director: '', // 负责人
-    effectiveCompany: '', // 原始记录编号
-    ids: [], // 导出集合
-    trainEndTime: '', // 结束时间
-    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    trainStartTime: '', // 开始时间
-    testCategory: '', // 检测类别
+    calibrationCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
-  trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      calibrationCategory: '',	// 校验类别
+      createUser: '',	// 创建人
+      manufacturingNo: '',	// 出厂编号
+      originalRecordCode: '',	// 原始记录单编号
+      sampleModel: '',	// 样品型号
+      sampleName: '',	// 样品名称
+      sampleNo: '',	// 样品编号
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    exportPrimitiveLogList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '原始记录列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  text: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IList, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/primitiveLogList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
-    `确认删除${row.text}吗？`,
+    `确认删除${row.originalRecordName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -130,28 +142,25 @@
     },
   )
     .then(() => {
-      // getListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      deletePrimitiveLogList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已删除')
+          fetchData(true)
+        }
+      })
     })
 }
 
-const handelClick = (text: string) => {}
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
+// 点击新建
 const add = () => {
   $router.push('/lab/primitiveLogList/add')
 }
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -162,6 +171,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -172,16 +182,21 @@
     }
   })
   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 => checkoutList.value.includes(item))
-    printJSON(printList, properties, '环境记录单列表')
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '原始记录单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
+})
 </script>
 
 <template>
@@ -189,57 +204,57 @@
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.effectiveCompany"
+          v-model.trim="listQuery.originalRecordCode"
           placeholder="原始记录编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.manufacturingNo"
           placeholder="出厂编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleModel"
           placeholder="型号"
           clearable
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.testCategory"
+          v-model="listQuery.calibrationCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
         >
           <el-option
-            v-for="item in testCategoryList"
-            :key="item.id"
+            v-for="item in mesureCategoryList"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"
+            :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.createUser"
           placeholder="创建人"
           clearable
         />
@@ -280,10 +295,10 @@
         @multiSelect="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/edit')"
                 size="small"
                 type="primary"
                 link
@@ -300,11 +315,11 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/delete')"
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c74b7dd..cd53837 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="EnvironmentalAdd">
+<script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -644,7 +644,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择检校时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -869,7 +869,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -883,7 +883,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
new file mode 100644
index 0000000..d5f85a0
--- /dev/null
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -0,0 +1,113 @@
+<!-- 终止操作 -->
+<script lang="ts" setup name="teminateDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import { interchangeListTerminate } from '../../../../api/business/schedule/interchangeList'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const formData = ref({
+  orderId: '', // 委托书id
+  reason: '', // 终止原因
+  sampleId: '', // 样品id
+  status: '5', // 样品状态
+})
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules = reactive<FormRules>({
+  reason: [{ required: true, message: '终止原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param orderId 委托书id
+ * @param sampleId 样品id
+ */
+function initDialog(row) {
+  // dataFormRef.value!.clearValidate()
+  formData.value.orderId = row.orderId
+  formData.value.sampleId = row.sampleId
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      // ElMessageBox.confirm(
+      //   '确认终止吗？',
+      //   '提示',
+      //   { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      // ).then(() => {
+      btnLoading.value = true
+      interchangeListTerminate(formData.value).then((res) => {
+        ElMessage.success('操作成功')
+        btnLoading.value = false
+        dialogVisible.value = false
+        emit('onSuccess')
+      }).catch((_) => {
+        btnLoading.value = false
+      })
+      // })
+    }
+  })
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="终止"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="请输入终止原因" prop="reason">
+            <el-input
+              v-model="formData.reason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm(dataFormRef)">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue
deleted file mode 100644
index dc864bd..0000000
--- a/src/views/business/schedule/interchange/buttonBox.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { DefaultProps } from 'element-plus'
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-// 按钮菜单
-const menu = [
-  { name: '待收入', id: 'taking' },
-  { name: '已收入', id: 'took' },
-  { name: '待归还', id: 'returning' },
-  { name: '已归还', id: 'returned' },
-  { name: '已超期', id: 'overtime' },
-]
-const current = ref('taking')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 76px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
deleted file mode 100644
index 27687fc..0000000
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ /dev/null
@@ -1,715 +0,0 @@
-<!-- 新建、编辑、详情 -->
-<script lang="ts" setup name="InterchangeEdit">
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ref } from 'vue'
-import { Search } from '@element-plus/icons-vue'
-import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
-import countries from '@/components/AddressSelect/country-code.json'
-import { UploadFile } from '@/api/measure/file'
-import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
-
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const pageType = ref('add') // 页面类型: add, edit, detail
-const countryList = ref(countries) // 国家列表
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
-const mesureCategoryMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const mesureCategoryList = [
-  {
-    label: '检定',
-    value: 'jd',
-  },
-  {
-    label: '检测',
-    value: 'jc',
-  },
-  {
-    label: '验收检定',
-    value: 'ysjd',
-  },
-  {
-    label: '抽检',
-    value: 'cj',
-  },
-  {
-    label: '校准',
-    value: 'jz',
-  },
-  {
-    label: '测试',
-    value: 'cs',
-  },
-  {
-    label: '验收校准',
-    value: 'ysjz',
-  },
-]// 校检类别
-const mesureResultList = [
-  {
-    label: '合格',
-    value: 'hg',
-  },
-  {
-    label: '修后合格',
-    value: 'xhhg',
-  },
-  {
-    label: '限用',
-    value: 'xy',
-  },
-  {
-    label: '准用',
-    value: 'zy',
-  },
-  {
-    label: '不合格',
-    value: 'bhg',
-  },
-  {
-    label: '漏检',
-    value: 'lj',
-  },
-  {
-    label: '逾期未检定',
-    value: 'yqwjd',
-  },
-]// 检定结果
-const mesureResultMap = {
-  hg: '合格',
-  xhhg: '修后合格',
-  xy: '限用',
-  zy: '准用',
-  bhg: '不合格',
-  lj: '漏检',
-  yqwjd: '逾期未检定',
-}// 检定结果字典
-const measureTypeList = [
-  {
-    label: '自检',
-    value: '1',
-  },
-  {
-    label: '外包',
-    value: '2',
-  },
-  {
-    label: '外检',
-    value: '3',
-  },
-]// 检定方式
-const dataForm: Ref<ISampleDetail> = ref({
-  id: '',
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 样品型号
-  manufacturingNo: '', // 出厂编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
-  manufacturer: '', // 生产厂家
-  manufacturerCountry: '', // 厂家国别
-  manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  // deliverer: '', // 送检人
-  // delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
-  remark: '', // 备注
-  minioFileName: '', // 说明书
-  labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-})
-const ruleFormRef = ref<FormInstance>()
-
-// 自定义校验规则--检定周期为正整数
-const validateMesurePeriod = (rule: any, value: any, callback: any) => {
-  if (value === '') {
-    callback()
-  }
-  else if (!(/(^[1-9]\d*$)/.test(value))) {
-    callback(new Error('请输入一个正整数'))
-  }
-  else {
-    callback()
-  }
-}
-
-// 校验规则
-const rules = reactive<FormRules>({
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
-  sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
-  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
-  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
-  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
-  postalCode: [{ required: true, message: '委托方邮编不能为空', trigger: 'blur' }],
-  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
-  mesureContent: [{ required: true, message: '检定项目不能为空', trigger: 'blur' }],
-  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-}) // 表单验证规则
-
-// 其他关联数据列表
-const dataList = ref({
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
-})
-
-// 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
-}
-// 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
-}
-
-// 菜单
-const menu: Menu[] = [
-  {
-    name: '检定记录',
-    columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
-    ],
-    list: 'measureRecords',
-    pagination: true,
-    searchFunc: fetchMeasureRecords,
-  },
-  {
-    name: '检定证书',
-    columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
-    ],
-    list: 'certificationRecords',
-    pagination: true,
-    searchFunc: fetchCertifications,
-  },
-]
-
-const currentMenu = ref('检定记录')
-const currentMenuObj = computed(() => {
-  return menu.find(item => item.name === currentMenu.value)
-})
-
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-
-// 打印表单
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '样品详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        dataForm.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-
-// 委托方代码获取焦点
-const customerNoFocus = () => {
-  visible.value = true
-}
-
-// 选好委托方
-const confirmCheckout = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.companyAddress = getValue.briefName
-  }
-}
-
-// 控制选择委托方对话框显隐
-const changeVisible = (val: boolean) => {
-  visible.value = val
-}
-
-// 保存
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        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)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取详情
-const getInfo = () => {
-  getSapmleDetail({ id: infoId.value }).then((res) => {
-    res.data = {
-      ABC: 'A',
-      companyAddress: '北京/北京市',
-      customerName: '京东集团',
-      customerNo: 'sygf202211290001',
-      id: '',
-      labelBind: '11222',
-      manufacturer: '北京某厂家',
-      manufacturerCountry: 'CN',
-      manufacturingDate: '2023-03',
-      manufacturingNo: '123121',
-      mesureCategory: 'jd',
-      mesureContent: '项目1',
-      mesurePeriod: '1',
-      mesureType: 'zj',
-      minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-      phone: '950618',
-      postalCode: 'test',
-      remark: '无备注',
-      sampleModel: '型号1',
-      sampleName: '样品1',
-      sampleNo: '',
-      measureResultCode: 'bhg',
-    }
-    // dataForm.value = res.data
-    // dataForm.value.measureResult = mesureResultMap[dataForm.value.measureResultCode]
-    // for (const item of menu) {
-    //   item.searchFunc()
-    // }
-  })
-}
-
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`样品-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <div id="form">
-        <el-form
-          ref="ruleFormRef"
-          :model="dataForm"
-          :label-width="120"
-          label-position="right"
-          :rules="rules"
-        >
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="样品编号:" prop="sampleNo">
-                <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="样品名称:" prop="sampleName">
-                <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col><el-col :span="6">
-              <el-form-item label="样品型号:" prop="sampleModel">
-                <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂编号:" prop="manufacturingNo">
-                <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方代码" prop="customerNo">
-                <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @focus="customerNoFocus"
-                >
-                  <template #suffix>
-                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
-                      <search />
-                    </el-icon>
-                  </template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方名称" prop="customerName">
-                <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话" prop="phone">
-                <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方邮编" prop="postalCode">
-                <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="18">
-              <el-form-item label="委托方地址:" prop="companyAddress">
-                <el-input
-                  v-model="dataForm.companyAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="校检类别:">
-                <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="生产厂家:">
-                <el-input
-                  v-model="dataForm.manufacturer"
-                  :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.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂年月:">
-                <el-date-picker
-                  v-model="dataForm.manufacturingDate"
-                  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="ABC:">
-                <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="检定周期（月）:" prop="mesurePeriod">
-                <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="送检人:">
-                <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="联系方式:">
-                <el-input
-                  v-model="dataForm.delivererTel"
-                  :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"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标签绑定:">
-                <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="检定项目:" prop="mesureContent">
-                <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="备注:">
-                <el-input
-                  v-model="dataForm.remark"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </detail-page>
-
-    <!-- 检定记录、检定证书 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
-      <template #menu>
-        <el-radio-group v-model="currentMenu">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </template>
-      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
-    </detail-block-switch>
-
-    <!-- 选择委托方组件 -->
-    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 1c6231e..f80d0c5 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -86,7 +86,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" props="comments">
+          <el-form-item label="请输入退回原因" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
new file mode 100644
index 0000000..ef91bfd
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -0,0 +1,37 @@
+// 列表查询接口
+export interface IListQuery {
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  manufacturingNo: string	// 出厂编号
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  offset: number // 当前页
+  limit: number // 每页多少条
+}
+
+// 表格
+export interface IList {
+  id: string // 主键
+  originalRecordCode: string	// 原始记录单编号
+  originalRecordName: string // 原始记录名称
+  customerSampleInfo: { // 样品信息
+    sampleNo: string	// 样品编号
+    sampleName: string	// 样品名称
+    manufacturingNo: string	// 出厂编号
+    sampleModel: string // 样品型号
+  }
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  createTime: string // 创建时间
+  remark: string // 备注
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 48dd59c..98c4257 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -1,72 +1,78 @@
-<script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+<!-- 原始记录列表 -->
+<script lang="ts" setup name="PrimitiveLogList">
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import QrDialog from '@/components/QrDialog/index.vue'
+import type { IList, IListQuery, dictType } from './primitiveLogList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '', // 创建结束时间
-  createStartTime: '', // 创建开始时间
-  deptId: '', // 部门id
-  director: '', // 负责人
-  effectiveCompany: '', // 原始记录编号
-  ids: [], // 导出集合
-  trainEndTime: '', // 结束时间
-  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  trainStartTime: '', // 开始时间
-  testCategory: '', // 检测类别
+import { getDictByCode } from '@/api/system/dict'
+
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+// 查询条件
+const listQuery = ref<IListQuery>({
+  calibrationCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 多选选中
 const checkoutList = ref<string[]>([])
-const list = ref([]) // 数据列表
+const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
 
-const $router = useRouter()
+// 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = []
-  loadingTable.value = false
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name, // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
 }
-fetchData(true)
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
-const { proxy } = getCurrentInstance() as any
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
-  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
-  { text: '样品编号', value: 'text', align: 'center' },
-  { text: '样品名称', value: 'text', align: 'center' },
-  { text: '出厂编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '检校类别', value: 'text', align: 'center' },
-  { text: '创建人', value: 'text', align: 'center' },
-  { text: '创建时间', value: 'text', align: 'center' },
-  { text: '备注', value: 'text', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -75,53 +81,59 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '', // 创建结束时间
-    createStartTime: '', // 创建开始时间
-    deptId: '', // 部门id
-    director: '', // 负责人
-    effectiveCompany: '', // 原始记录编号
-    ids: [], // 导出集合
-    trainEndTime: '', // 结束时间
-    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    trainStartTime: '', // 开始时间
-    testCategory: '', // 检测类别
+    calibrationCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
-  trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      calibrationCategory: '',	// 校验类别
+      createUser: '',	// 创建人
+      manufacturingNo: '',	// 出厂编号
+      originalRecordCode: '',	// 原始记录单编号
+      sampleModel: '',	// 样品型号
+      sampleName: '',	// 样品名称
+      sampleNo: '',	// 样品编号
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    exportPrimitiveLogList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '原始记录列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  text: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IList, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/primitiveLogList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
-    `确认删除${row.text}吗？`,
+    `确认删除${row.originalRecordName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -130,28 +142,25 @@
     },
   )
     .then(() => {
-      // getListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      deletePrimitiveLogList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已删除')
+          fetchData(true)
+        }
+      })
     })
 }
 
-const handelClick = (text: string) => {}
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
+// 点击新建
 const add = () => {
   $router.push('/lab/primitiveLogList/add')
 }
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -162,6 +171,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -172,16 +182,21 @@
     }
   })
   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 => checkoutList.value.includes(item))
-    printJSON(printList, properties, '环境记录单列表')
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '原始记录单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
+})
 </script>
 
 <template>
@@ -189,57 +204,57 @@
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.effectiveCompany"
+          v-model.trim="listQuery.originalRecordCode"
           placeholder="原始记录编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.manufacturingNo"
           placeholder="出厂编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleModel"
           placeholder="型号"
           clearable
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.testCategory"
+          v-model="listQuery.calibrationCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
         >
           <el-option
-            v-for="item in testCategoryList"
-            :key="item.id"
+            v-for="item in mesureCategoryList"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"
+            :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.createUser"
           placeholder="创建人"
           clearable
         />
@@ -280,10 +295,10 @@
         @multiSelect="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/edit')"
                 size="small"
                 type="primary"
                 link
@@ -300,11 +315,11 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/delete')"
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c74b7dd..cd53837 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="EnvironmentalAdd">
+<script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -644,7 +644,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择检校时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -869,7 +869,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -883,7 +883,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
new file mode 100644
index 0000000..d5f85a0
--- /dev/null
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -0,0 +1,113 @@
+<!-- 终止操作 -->
+<script lang="ts" setup name="teminateDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import { interchangeListTerminate } from '../../../../api/business/schedule/interchangeList'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const formData = ref({
+  orderId: '', // 委托书id
+  reason: '', // 终止原因
+  sampleId: '', // 样品id
+  status: '5', // 样品状态
+})
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules = reactive<FormRules>({
+  reason: [{ required: true, message: '终止原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param orderId 委托书id
+ * @param sampleId 样品id
+ */
+function initDialog(row) {
+  // dataFormRef.value!.clearValidate()
+  formData.value.orderId = row.orderId
+  formData.value.sampleId = row.sampleId
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      // ElMessageBox.confirm(
+      //   '确认终止吗？',
+      //   '提示',
+      //   { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      // ).then(() => {
+      btnLoading.value = true
+      interchangeListTerminate(formData.value).then((res) => {
+        ElMessage.success('操作成功')
+        btnLoading.value = false
+        dialogVisible.value = false
+        emit('onSuccess')
+      }).catch((_) => {
+        btnLoading.value = false
+      })
+      // })
+    }
+  })
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="终止"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="请输入终止原因" prop="reason">
+            <el-input
+              v-model="formData.reason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm(dataFormRef)">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue
deleted file mode 100644
index dc864bd..0000000
--- a/src/views/business/schedule/interchange/buttonBox.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { DefaultProps } from 'element-plus'
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-// 按钮菜单
-const menu = [
-  { name: '待收入', id: 'taking' },
-  { name: '已收入', id: 'took' },
-  { name: '待归还', id: 'returning' },
-  { name: '已归还', id: 'returned' },
-  { name: '已超期', id: 'overtime' },
-]
-const current = ref('taking')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 76px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
deleted file mode 100644
index 27687fc..0000000
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ /dev/null
@@ -1,715 +0,0 @@
-<!-- 新建、编辑、详情 -->
-<script lang="ts" setup name="InterchangeEdit">
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ref } from 'vue'
-import { Search } from '@element-plus/icons-vue'
-import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
-import countries from '@/components/AddressSelect/country-code.json'
-import { UploadFile } from '@/api/measure/file'
-import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
-
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const pageType = ref('add') // 页面类型: add, edit, detail
-const countryList = ref(countries) // 国家列表
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
-const mesureCategoryMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const mesureCategoryList = [
-  {
-    label: '检定',
-    value: 'jd',
-  },
-  {
-    label: '检测',
-    value: 'jc',
-  },
-  {
-    label: '验收检定',
-    value: 'ysjd',
-  },
-  {
-    label: '抽检',
-    value: 'cj',
-  },
-  {
-    label: '校准',
-    value: 'jz',
-  },
-  {
-    label: '测试',
-    value: 'cs',
-  },
-  {
-    label: '验收校准',
-    value: 'ysjz',
-  },
-]// 校检类别
-const mesureResultList = [
-  {
-    label: '合格',
-    value: 'hg',
-  },
-  {
-    label: '修后合格',
-    value: 'xhhg',
-  },
-  {
-    label: '限用',
-    value: 'xy',
-  },
-  {
-    label: '准用',
-    value: 'zy',
-  },
-  {
-    label: '不合格',
-    value: 'bhg',
-  },
-  {
-    label: '漏检',
-    value: 'lj',
-  },
-  {
-    label: '逾期未检定',
-    value: 'yqwjd',
-  },
-]// 检定结果
-const mesureResultMap = {
-  hg: '合格',
-  xhhg: '修后合格',
-  xy: '限用',
-  zy: '准用',
-  bhg: '不合格',
-  lj: '漏检',
-  yqwjd: '逾期未检定',
-}// 检定结果字典
-const measureTypeList = [
-  {
-    label: '自检',
-    value: '1',
-  },
-  {
-    label: '外包',
-    value: '2',
-  },
-  {
-    label: '外检',
-    value: '3',
-  },
-]// 检定方式
-const dataForm: Ref<ISampleDetail> = ref({
-  id: '',
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 样品型号
-  manufacturingNo: '', // 出厂编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
-  manufacturer: '', // 生产厂家
-  manufacturerCountry: '', // 厂家国别
-  manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  // deliverer: '', // 送检人
-  // delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
-  remark: '', // 备注
-  minioFileName: '', // 说明书
-  labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-})
-const ruleFormRef = ref<FormInstance>()
-
-// 自定义校验规则--检定周期为正整数
-const validateMesurePeriod = (rule: any, value: any, callback: any) => {
-  if (value === '') {
-    callback()
-  }
-  else if (!(/(^[1-9]\d*$)/.test(value))) {
-    callback(new Error('请输入一个正整数'))
-  }
-  else {
-    callback()
-  }
-}
-
-// 校验规则
-const rules = reactive<FormRules>({
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
-  sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
-  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
-  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
-  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
-  postalCode: [{ required: true, message: '委托方邮编不能为空', trigger: 'blur' }],
-  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
-  mesureContent: [{ required: true, message: '检定项目不能为空', trigger: 'blur' }],
-  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-}) // 表单验证规则
-
-// 其他关联数据列表
-const dataList = ref({
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
-})
-
-// 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
-}
-// 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
-}
-
-// 菜单
-const menu: Menu[] = [
-  {
-    name: '检定记录',
-    columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
-    ],
-    list: 'measureRecords',
-    pagination: true,
-    searchFunc: fetchMeasureRecords,
-  },
-  {
-    name: '检定证书',
-    columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
-    ],
-    list: 'certificationRecords',
-    pagination: true,
-    searchFunc: fetchCertifications,
-  },
-]
-
-const currentMenu = ref('检定记录')
-const currentMenuObj = computed(() => {
-  return menu.find(item => item.name === currentMenu.value)
-})
-
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-
-// 打印表单
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '样品详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        dataForm.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-
-// 委托方代码获取焦点
-const customerNoFocus = () => {
-  visible.value = true
-}
-
-// 选好委托方
-const confirmCheckout = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.companyAddress = getValue.briefName
-  }
-}
-
-// 控制选择委托方对话框显隐
-const changeVisible = (val: boolean) => {
-  visible.value = val
-}
-
-// 保存
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        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)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取详情
-const getInfo = () => {
-  getSapmleDetail({ id: infoId.value }).then((res) => {
-    res.data = {
-      ABC: 'A',
-      companyAddress: '北京/北京市',
-      customerName: '京东集团',
-      customerNo: 'sygf202211290001',
-      id: '',
-      labelBind: '11222',
-      manufacturer: '北京某厂家',
-      manufacturerCountry: 'CN',
-      manufacturingDate: '2023-03',
-      manufacturingNo: '123121',
-      mesureCategory: 'jd',
-      mesureContent: '项目1',
-      mesurePeriod: '1',
-      mesureType: 'zj',
-      minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-      phone: '950618',
-      postalCode: 'test',
-      remark: '无备注',
-      sampleModel: '型号1',
-      sampleName: '样品1',
-      sampleNo: '',
-      measureResultCode: 'bhg',
-    }
-    // dataForm.value = res.data
-    // dataForm.value.measureResult = mesureResultMap[dataForm.value.measureResultCode]
-    // for (const item of menu) {
-    //   item.searchFunc()
-    // }
-  })
-}
-
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`样品-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <div id="form">
-        <el-form
-          ref="ruleFormRef"
-          :model="dataForm"
-          :label-width="120"
-          label-position="right"
-          :rules="rules"
-        >
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="样品编号:" prop="sampleNo">
-                <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="样品名称:" prop="sampleName">
-                <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col><el-col :span="6">
-              <el-form-item label="样品型号:" prop="sampleModel">
-                <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂编号:" prop="manufacturingNo">
-                <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方代码" prop="customerNo">
-                <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @focus="customerNoFocus"
-                >
-                  <template #suffix>
-                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
-                      <search />
-                    </el-icon>
-                  </template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方名称" prop="customerName">
-                <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话" prop="phone">
-                <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方邮编" prop="postalCode">
-                <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="18">
-              <el-form-item label="委托方地址:" prop="companyAddress">
-                <el-input
-                  v-model="dataForm.companyAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="校检类别:">
-                <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="生产厂家:">
-                <el-input
-                  v-model="dataForm.manufacturer"
-                  :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.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂年月:">
-                <el-date-picker
-                  v-model="dataForm.manufacturingDate"
-                  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="ABC:">
-                <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="检定周期（月）:" prop="mesurePeriod">
-                <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="送检人:">
-                <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="联系方式:">
-                <el-input
-                  v-model="dataForm.delivererTel"
-                  :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"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标签绑定:">
-                <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="检定项目:" prop="mesureContent">
-                <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="备注:">
-                <el-input
-                  v-model="dataForm.remark"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </detail-page>
-
-    <!-- 检定记录、检定证书 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
-      <template #menu>
-        <el-radio-group v-model="currentMenu">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </template>
-      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
-    </detail-block-switch>
-
-    <!-- 选择委托方组件 -->
-    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 6e5c9b9..6b3eb34 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -1,88 +1,74 @@
+<!-- 设备收发列表 -->
 <script lang="ts" setup name="InterchangeList">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IListQuery, IinterchangeList } from './interchange_interface'
-import ButtonBox from './buttonBox.vue'
+import teminateDialog from '../components/terminateDialog.vue'
+import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   exportInterchangeList,
   getInterChangeList,
-  interchangeListBack,
-  interchangeListComplete,
-  interchangeListDelete,
-  interchangeListReturn,
-  interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
+  interchangeStatusChange,
 } from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import buttonBox from '@/components/buttonBox/buttonBox.vue'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
-
-// 是否加急
-const isUrgentMap = [
-  { label: '全部', value: '0' },
-  { label: '是', value: '1' },
-  { label: '否', value: '2' },
-]
-
-// 样品属性
-const sampleAttrMap = [
-  { label: '全部', value: '0' },
-  { label: '客户样品', value: '1' },
-  { label: '自有设备', value: '2' },
-]
-
-const currentMenu = ref('taking') // buttonBox菜单选中项
+const menu = ref<IMenu[]>([]) // 右上角菜单
+const currentMenu = ref('') // 选中的按钮
+const active = ref('') // 选中的按钮的code
+const terminateRef = ref() // 确认终止dialog
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
-  type: '',
+  sampleBelong: '', // 样品属性
+  sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
 // 表头待收入
 const columnsTaking = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
-
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '实际送达时间', value: 'deliverTime', align: 'center' },
+  { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
-  { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
 ])
 
@@ -94,66 +80,86 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
+const isUrgentMap = ref<dictType[]>([]) // 是否加急
+const sampleAttrMap = ref<dictType[]>([]) // 样品属性
+const sampleStatusMap = ref<dictType[]>([]) // 样品状态
+
+// 获取字典值
+async function getDict() {
+  // 是否加急
+  getDictByCode('isUrgent').then((response) => {
+    isUrgentMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value,
+      }
+    })
+    // 在已有的字典的基础上增加一个全部0进去
+    isUrgentMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2', // 是否加急全部后端定为2
+    })
+  })
+  // 样品属性
+  getDictByCode('sampleBelong').then((response) => {
+    sampleAttrMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value, // 后端需要int型，在此转换
+      }
+    })
+    // 在已有的字典的基础上增加一个全部进去
+    sampleAttrMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2',
+    })
+  })
+  // 样品状态
+  const res = await getDictByCode('sampleStatus')
+  sampleStatusMap.value = res.data.map((item: dictType) => {
+    return {
+      ...item,
+      value: parseInt(item.value as string), // 后端需要int型，在此转换
+    }
+  })
+  // 制作右上角的菜单
+  sampleStatusMap.value.forEach((item: dictType) => {
+    if (item.name === '待收入' || item.name === '待归还'
+      || item.name === '已归还' || item.name === '已超期') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+  menu.value.splice(1, 0, {
+    name: '已收入',
+    id: '2', // 后端规定已收入传2
+  })
+}
+
 // 数据查询
 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 || ''
-  listQuery.value.type = currentMenu.value
-  // getInterChangeList(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', // 预计送达时间
-  //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: 'test',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      orderCode: 'test', // 委托书编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      deliverer: 'test', // 送检人
-      isUrgent: '1', // 是否加急
-      sampleAttr: '1', // 样品属性
-      planDeliverTime: 'test', // 预计送达时间
-      deliverTime: 'test', // 实际送达时间
-      requireOverTime: 'test', // 要求检完时间
-      currentCertifications: '1', // 已出具证书总数
-      requireCertifications: '5', // 应出具证书总数
-      currentDeliver: 'test', // 当前检定环节
-    }].map((item: IinterchangeList) => {
-    return {
-      ...item,
-      Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
-    }
+  listQuery.value.sampleStatus = active.value
+  getInterChangeList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IinterchangeList) => {
+      return {
+        ...item,
+        Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
+        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
 }
 
@@ -166,17 +172,18 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    orderCode: '', // 委托书编号
+    orderNo: '', // 委托书编号
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    type: currentMenu.value,
+    sampleBelong: '', // 样品属性
+    sampleStatus: '',
     offset: 1,
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 多选发生改变时
@@ -195,11 +202,17 @@
   fetchData(true)
 }
 
-// 监听buttonBox切换
+// 按钮切换
 const changeCurrentButton = (val: string) => {
-  currentMenu.value = val
-  console.log(currentMenu.value)
-
+  active.value = val
+  const currentMenuItem = menu.value.find(item => item.id === val)
+  if (val === '2') {
+    currentMenu.value = '已收入'
+  }
+  else {
+    currentMenu.value = currentMenuItem!.name
+  }
+  window.sessionStorage.setItem('interchangeActive', val)
   fetchData(true)
 }
 
@@ -223,13 +236,13 @@
     const params = {
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
-      orderCode: listQuery.value.orderCode, // 委托书编号
+      orderNo: listQuery.value.orderNo, // 委托书编号
       customerId: listQuery.value.customerId, // 委托方代码
       startTime: listQuery.value.startTime, // 预计送达开始时间
       endTime: listQuery.value.endTime, // 预计送达结束时间
       isUrgent: listQuery.value.isUrgent, // 是否加急
-      sampleAttr: listQuery.value.sampleAttr, // 样品属性
-      type: currentMenu.value,
+      sampleBelong: listQuery.value.sampleBelong, // 样品属性
+      sampleStatus: active.value, // 样品状态
       ids: checkoutList.value,
     }
     exportInterchangeList(params).then((res) => {
@@ -256,15 +269,15 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'delete') { // 无需检测
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -272,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -280,7 +293,17 @@
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
+        let status
+        if (currentMenu.value === '已收入') {
+          status = '1'
+        }
+        if (currentMenu.value === '待归还') {
+          status = '2'
+        }
+        if (currentMenu.value === '已归还') {
+          status = '5'
+        }
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -288,15 +311,15 @@
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '6' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'urge') { // 催办 ------------------- 后端未开发完
+        interchangeListUrge({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -304,12 +327,7 @@
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success(`已${title}`)
-            fetchData(true)
-          }
-        })
+        terminateRef.value.initDialog(row)
       }
     })
 }
@@ -317,9 +335,9 @@
 // 打印列表
 function printList() {
   // 打印列
-  let column = columnsTaking.value
-  if (currentMenu.value === 'taking') {
-    column = columns.value
+  let column = columns.value
+  if (currentMenu.value === '待收入') {
+    column = columnsTaking.value
   }
   const properties = column.map((item) => {
     return {
@@ -341,10 +359,19 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
+  $router.push(`/sample/${pageType}/${row.sampleId}`)
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict() // 字典
+  if (window.sessionStorage.getItem('interchangeActive')) {
+    active.value = window.sessionStorage.getItem('interchangeActive')!
+  }
+  else {
+    active.value = '1' // 待收入
+  }
+  fetchData(true) // 列表数据
+})
 </script>
 
 <template>
@@ -371,7 +398,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.orderCode"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           class="short-input"
           clearable
@@ -403,17 +430,17 @@
           <el-option
             v-for="item in isUrgentMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
           <el-option
             v-for="item in sampleAttrMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
@@ -421,21 +448,21 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === 'taking'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === 'took' || currentMenu === 'overtime') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === 'returning'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
-        :data="list" :total="total" :columns="currentMenu === 'taking' ? columnsTaking : columns" :query="listQuery"
+        :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="240">
+          <el-table-column label="操作" align="center" fixed="right" width="270">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === '待收入'"
                 size="small"
                 type="primary"
                 link
@@ -452,7 +479,7 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === 'taking' || currentMenu === 'took' || currentMenu === 'returning')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === '待收入' || currentMenu === '已收入' || currentMenu === '待归还')"
                 size="small"
                 link
                 type="primary"
@@ -461,7 +488,7 @@
                 标签绑定
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="primary"
@@ -470,7 +497,7 @@
                 收入
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="danger"
@@ -479,7 +506,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
                 size="small"
                 link
                 type="primary"
@@ -488,7 +515,7 @@
                 完成
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === 'returning'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === '待归还'"
                 size="small"
                 link
                 type="primary"
@@ -497,7 +524,7 @@
                 归还
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === 'returning' || currentMenu === 'took' || currentMenu === 'returned')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === '待归还' || currentMenu === '已收入' || currentMenu === '已归还')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +533,7 @@
                 回退
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === 'overtime'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === '已超期'"
                 size="small"
                 link
                 type="primary"
@@ -515,7 +542,7 @@
                 催办
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/terminate') && (currentMenu === 'took' || currentMenu === 'overtime')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/terminate')"
                 size="small"
                 link
                 type="primary"
@@ -528,7 +555,9 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <!-- 终止弹窗 -->
+    <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
   </app-container>
 </template>
 

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 1c6231e..f80d0c5 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -86,7 +86,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" props="comments">
+          <el-form-item label="请输入退回原因" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
new file mode 100644
index 0000000..ef91bfd
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -0,0 +1,37 @@
+// 列表查询接口
+export interface IListQuery {
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  manufacturingNo: string	// 出厂编号
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  offset: number // 当前页
+  limit: number // 每页多少条
+}
+
+// 表格
+export interface IList {
+  id: string // 主键
+  originalRecordCode: string	// 原始记录单编号
+  originalRecordName: string // 原始记录名称
+  customerSampleInfo: { // 样品信息
+    sampleNo: string	// 样品编号
+    sampleName: string	// 样品名称
+    manufacturingNo: string	// 出厂编号
+    sampleModel: string // 样品型号
+  }
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  createTime: string // 创建时间
+  remark: string // 备注
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 48dd59c..98c4257 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -1,72 +1,78 @@
-<script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+<!-- 原始记录列表 -->
+<script lang="ts" setup name="PrimitiveLogList">
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import QrDialog from '@/components/QrDialog/index.vue'
+import type { IList, IListQuery, dictType } from './primitiveLogList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '', // 创建结束时间
-  createStartTime: '', // 创建开始时间
-  deptId: '', // 部门id
-  director: '', // 负责人
-  effectiveCompany: '', // 原始记录编号
-  ids: [], // 导出集合
-  trainEndTime: '', // 结束时间
-  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  trainStartTime: '', // 开始时间
-  testCategory: '', // 检测类别
+import { getDictByCode } from '@/api/system/dict'
+
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+// 查询条件
+const listQuery = ref<IListQuery>({
+  calibrationCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 多选选中
 const checkoutList = ref<string[]>([])
-const list = ref([]) // 数据列表
+const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
 
-const $router = useRouter()
+// 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = []
-  loadingTable.value = false
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name, // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
 }
-fetchData(true)
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
-const { proxy } = getCurrentInstance() as any
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
-  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
-  { text: '样品编号', value: 'text', align: 'center' },
-  { text: '样品名称', value: 'text', align: 'center' },
-  { text: '出厂编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '检校类别', value: 'text', align: 'center' },
-  { text: '创建人', value: 'text', align: 'center' },
-  { text: '创建时间', value: 'text', align: 'center' },
-  { text: '备注', value: 'text', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -75,53 +81,59 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '', // 创建结束时间
-    createStartTime: '', // 创建开始时间
-    deptId: '', // 部门id
-    director: '', // 负责人
-    effectiveCompany: '', // 原始记录编号
-    ids: [], // 导出集合
-    trainEndTime: '', // 结束时间
-    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    trainStartTime: '', // 开始时间
-    testCategory: '', // 检测类别
+    calibrationCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
-  trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      calibrationCategory: '',	// 校验类别
+      createUser: '',	// 创建人
+      manufacturingNo: '',	// 出厂编号
+      originalRecordCode: '',	// 原始记录单编号
+      sampleModel: '',	// 样品型号
+      sampleName: '',	// 样品名称
+      sampleNo: '',	// 样品编号
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    exportPrimitiveLogList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '原始记录列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  text: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IList, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/primitiveLogList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
-    `确认删除${row.text}吗？`,
+    `确认删除${row.originalRecordName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -130,28 +142,25 @@
     },
   )
     .then(() => {
-      // getListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      deletePrimitiveLogList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已删除')
+          fetchData(true)
+        }
+      })
     })
 }
 
-const handelClick = (text: string) => {}
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
+// 点击新建
 const add = () => {
   $router.push('/lab/primitiveLogList/add')
 }
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -162,6 +171,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -172,16 +182,21 @@
     }
   })
   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 => checkoutList.value.includes(item))
-    printJSON(printList, properties, '环境记录单列表')
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '原始记录单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
+})
 </script>
 
 <template>
@@ -189,57 +204,57 @@
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.effectiveCompany"
+          v-model.trim="listQuery.originalRecordCode"
           placeholder="原始记录编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.manufacturingNo"
           placeholder="出厂编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleModel"
           placeholder="型号"
           clearable
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.testCategory"
+          v-model="listQuery.calibrationCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
         >
           <el-option
-            v-for="item in testCategoryList"
-            :key="item.id"
+            v-for="item in mesureCategoryList"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"
+            :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.createUser"
           placeholder="创建人"
           clearable
         />
@@ -280,10 +295,10 @@
         @multiSelect="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/edit')"
                 size="small"
                 type="primary"
                 link
@@ -300,11 +315,11 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/delete')"
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c74b7dd..cd53837 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="EnvironmentalAdd">
+<script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -644,7 +644,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择检校时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -869,7 +869,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -883,7 +883,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
new file mode 100644
index 0000000..d5f85a0
--- /dev/null
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -0,0 +1,113 @@
+<!-- 终止操作 -->
+<script lang="ts" setup name="teminateDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import { interchangeListTerminate } from '../../../../api/business/schedule/interchangeList'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const formData = ref({
+  orderId: '', // 委托书id
+  reason: '', // 终止原因
+  sampleId: '', // 样品id
+  status: '5', // 样品状态
+})
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules = reactive<FormRules>({
+  reason: [{ required: true, message: '终止原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param orderId 委托书id
+ * @param sampleId 样品id
+ */
+function initDialog(row) {
+  // dataFormRef.value!.clearValidate()
+  formData.value.orderId = row.orderId
+  formData.value.sampleId = row.sampleId
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      // ElMessageBox.confirm(
+      //   '确认终止吗？',
+      //   '提示',
+      //   { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      // ).then(() => {
+      btnLoading.value = true
+      interchangeListTerminate(formData.value).then((res) => {
+        ElMessage.success('操作成功')
+        btnLoading.value = false
+        dialogVisible.value = false
+        emit('onSuccess')
+      }).catch((_) => {
+        btnLoading.value = false
+      })
+      // })
+    }
+  })
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="终止"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="请输入终止原因" prop="reason">
+            <el-input
+              v-model="formData.reason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm(dataFormRef)">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue
deleted file mode 100644
index dc864bd..0000000
--- a/src/views/business/schedule/interchange/buttonBox.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { DefaultProps } from 'element-plus'
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-// 按钮菜单
-const menu = [
-  { name: '待收入', id: 'taking' },
-  { name: '已收入', id: 'took' },
-  { name: '待归还', id: 'returning' },
-  { name: '已归还', id: 'returned' },
-  { name: '已超期', id: 'overtime' },
-]
-const current = ref('taking')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 76px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
deleted file mode 100644
index 27687fc..0000000
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ /dev/null
@@ -1,715 +0,0 @@
-<!-- 新建、编辑、详情 -->
-<script lang="ts" setup name="InterchangeEdit">
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ref } from 'vue'
-import { Search } from '@element-plus/icons-vue'
-import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
-import countries from '@/components/AddressSelect/country-code.json'
-import { UploadFile } from '@/api/measure/file'
-import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
-
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const pageType = ref('add') // 页面类型: add, edit, detail
-const countryList = ref(countries) // 国家列表
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
-const mesureCategoryMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const mesureCategoryList = [
-  {
-    label: '检定',
-    value: 'jd',
-  },
-  {
-    label: '检测',
-    value: 'jc',
-  },
-  {
-    label: '验收检定',
-    value: 'ysjd',
-  },
-  {
-    label: '抽检',
-    value: 'cj',
-  },
-  {
-    label: '校准',
-    value: 'jz',
-  },
-  {
-    label: '测试',
-    value: 'cs',
-  },
-  {
-    label: '验收校准',
-    value: 'ysjz',
-  },
-]// 校检类别
-const mesureResultList = [
-  {
-    label: '合格',
-    value: 'hg',
-  },
-  {
-    label: '修后合格',
-    value: 'xhhg',
-  },
-  {
-    label: '限用',
-    value: 'xy',
-  },
-  {
-    label: '准用',
-    value: 'zy',
-  },
-  {
-    label: '不合格',
-    value: 'bhg',
-  },
-  {
-    label: '漏检',
-    value: 'lj',
-  },
-  {
-    label: '逾期未检定',
-    value: 'yqwjd',
-  },
-]// 检定结果
-const mesureResultMap = {
-  hg: '合格',
-  xhhg: '修后合格',
-  xy: '限用',
-  zy: '准用',
-  bhg: '不合格',
-  lj: '漏检',
-  yqwjd: '逾期未检定',
-}// 检定结果字典
-const measureTypeList = [
-  {
-    label: '自检',
-    value: '1',
-  },
-  {
-    label: '外包',
-    value: '2',
-  },
-  {
-    label: '外检',
-    value: '3',
-  },
-]// 检定方式
-const dataForm: Ref<ISampleDetail> = ref({
-  id: '',
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 样品型号
-  manufacturingNo: '', // 出厂编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
-  manufacturer: '', // 生产厂家
-  manufacturerCountry: '', // 厂家国别
-  manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  // deliverer: '', // 送检人
-  // delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
-  remark: '', // 备注
-  minioFileName: '', // 说明书
-  labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-})
-const ruleFormRef = ref<FormInstance>()
-
-// 自定义校验规则--检定周期为正整数
-const validateMesurePeriod = (rule: any, value: any, callback: any) => {
-  if (value === '') {
-    callback()
-  }
-  else if (!(/(^[1-9]\d*$)/.test(value))) {
-    callback(new Error('请输入一个正整数'))
-  }
-  else {
-    callback()
-  }
-}
-
-// 校验规则
-const rules = reactive<FormRules>({
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
-  sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
-  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
-  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
-  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
-  postalCode: [{ required: true, message: '委托方邮编不能为空', trigger: 'blur' }],
-  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
-  mesureContent: [{ required: true, message: '检定项目不能为空', trigger: 'blur' }],
-  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-}) // 表单验证规则
-
-// 其他关联数据列表
-const dataList = ref({
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
-})
-
-// 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
-}
-// 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
-}
-
-// 菜单
-const menu: Menu[] = [
-  {
-    name: '检定记录',
-    columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
-    ],
-    list: 'measureRecords',
-    pagination: true,
-    searchFunc: fetchMeasureRecords,
-  },
-  {
-    name: '检定证书',
-    columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
-    ],
-    list: 'certificationRecords',
-    pagination: true,
-    searchFunc: fetchCertifications,
-  },
-]
-
-const currentMenu = ref('检定记录')
-const currentMenuObj = computed(() => {
-  return menu.find(item => item.name === currentMenu.value)
-})
-
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-
-// 打印表单
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '样品详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        dataForm.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-
-// 委托方代码获取焦点
-const customerNoFocus = () => {
-  visible.value = true
-}
-
-// 选好委托方
-const confirmCheckout = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.companyAddress = getValue.briefName
-  }
-}
-
-// 控制选择委托方对话框显隐
-const changeVisible = (val: boolean) => {
-  visible.value = val
-}
-
-// 保存
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        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)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取详情
-const getInfo = () => {
-  getSapmleDetail({ id: infoId.value }).then((res) => {
-    res.data = {
-      ABC: 'A',
-      companyAddress: '北京/北京市',
-      customerName: '京东集团',
-      customerNo: 'sygf202211290001',
-      id: '',
-      labelBind: '11222',
-      manufacturer: '北京某厂家',
-      manufacturerCountry: 'CN',
-      manufacturingDate: '2023-03',
-      manufacturingNo: '123121',
-      mesureCategory: 'jd',
-      mesureContent: '项目1',
-      mesurePeriod: '1',
-      mesureType: 'zj',
-      minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-      phone: '950618',
-      postalCode: 'test',
-      remark: '无备注',
-      sampleModel: '型号1',
-      sampleName: '样品1',
-      sampleNo: '',
-      measureResultCode: 'bhg',
-    }
-    // dataForm.value = res.data
-    // dataForm.value.measureResult = mesureResultMap[dataForm.value.measureResultCode]
-    // for (const item of menu) {
-    //   item.searchFunc()
-    // }
-  })
-}
-
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`样品-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <div id="form">
-        <el-form
-          ref="ruleFormRef"
-          :model="dataForm"
-          :label-width="120"
-          label-position="right"
-          :rules="rules"
-        >
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="样品编号:" prop="sampleNo">
-                <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="样品名称:" prop="sampleName">
-                <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col><el-col :span="6">
-              <el-form-item label="样品型号:" prop="sampleModel">
-                <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂编号:" prop="manufacturingNo">
-                <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方代码" prop="customerNo">
-                <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @focus="customerNoFocus"
-                >
-                  <template #suffix>
-                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
-                      <search />
-                    </el-icon>
-                  </template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方名称" prop="customerName">
-                <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话" prop="phone">
-                <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方邮编" prop="postalCode">
-                <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="18">
-              <el-form-item label="委托方地址:" prop="companyAddress">
-                <el-input
-                  v-model="dataForm.companyAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="校检类别:">
-                <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="生产厂家:">
-                <el-input
-                  v-model="dataForm.manufacturer"
-                  :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.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂年月:">
-                <el-date-picker
-                  v-model="dataForm.manufacturingDate"
-                  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="ABC:">
-                <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="检定周期（月）:" prop="mesurePeriod">
-                <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="送检人:">
-                <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="联系方式:">
-                <el-input
-                  v-model="dataForm.delivererTel"
-                  :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"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标签绑定:">
-                <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="检定项目:" prop="mesureContent">
-                <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="备注:">
-                <el-input
-                  v-model="dataForm.remark"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </detail-page>
-
-    <!-- 检定记录、检定证书 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
-      <template #menu>
-        <el-radio-group v-model="currentMenu">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </template>
-      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
-    </detail-block-switch>
-
-    <!-- 选择委托方组件 -->
-    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 6e5c9b9..6b3eb34 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -1,88 +1,74 @@
+<!-- 设备收发列表 -->
 <script lang="ts" setup name="InterchangeList">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IListQuery, IinterchangeList } from './interchange_interface'
-import ButtonBox from './buttonBox.vue'
+import teminateDialog from '../components/terminateDialog.vue'
+import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   exportInterchangeList,
   getInterChangeList,
-  interchangeListBack,
-  interchangeListComplete,
-  interchangeListDelete,
-  interchangeListReturn,
-  interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
+  interchangeStatusChange,
 } from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import buttonBox from '@/components/buttonBox/buttonBox.vue'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
-
-// 是否加急
-const isUrgentMap = [
-  { label: '全部', value: '0' },
-  { label: '是', value: '1' },
-  { label: '否', value: '2' },
-]
-
-// 样品属性
-const sampleAttrMap = [
-  { label: '全部', value: '0' },
-  { label: '客户样品', value: '1' },
-  { label: '自有设备', value: '2' },
-]
-
-const currentMenu = ref('taking') // buttonBox菜单选中项
+const menu = ref<IMenu[]>([]) // 右上角菜单
+const currentMenu = ref('') // 选中的按钮
+const active = ref('') // 选中的按钮的code
+const terminateRef = ref() // 确认终止dialog
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
-  type: '',
+  sampleBelong: '', // 样品属性
+  sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
 // 表头待收入
 const columnsTaking = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
-
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '实际送达时间', value: 'deliverTime', align: 'center' },
+  { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
-  { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
 ])
 
@@ -94,66 +80,86 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
+const isUrgentMap = ref<dictType[]>([]) // 是否加急
+const sampleAttrMap = ref<dictType[]>([]) // 样品属性
+const sampleStatusMap = ref<dictType[]>([]) // 样品状态
+
+// 获取字典值
+async function getDict() {
+  // 是否加急
+  getDictByCode('isUrgent').then((response) => {
+    isUrgentMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value,
+      }
+    })
+    // 在已有的字典的基础上增加一个全部0进去
+    isUrgentMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2', // 是否加急全部后端定为2
+    })
+  })
+  // 样品属性
+  getDictByCode('sampleBelong').then((response) => {
+    sampleAttrMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value, // 后端需要int型，在此转换
+      }
+    })
+    // 在已有的字典的基础上增加一个全部进去
+    sampleAttrMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2',
+    })
+  })
+  // 样品状态
+  const res = await getDictByCode('sampleStatus')
+  sampleStatusMap.value = res.data.map((item: dictType) => {
+    return {
+      ...item,
+      value: parseInt(item.value as string), // 后端需要int型，在此转换
+    }
+  })
+  // 制作右上角的菜单
+  sampleStatusMap.value.forEach((item: dictType) => {
+    if (item.name === '待收入' || item.name === '待归还'
+      || item.name === '已归还' || item.name === '已超期') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+  menu.value.splice(1, 0, {
+    name: '已收入',
+    id: '2', // 后端规定已收入传2
+  })
+}
+
 // 数据查询
 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 || ''
-  listQuery.value.type = currentMenu.value
-  // getInterChangeList(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', // 预计送达时间
-  //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: 'test',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      orderCode: 'test', // 委托书编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      deliverer: 'test', // 送检人
-      isUrgent: '1', // 是否加急
-      sampleAttr: '1', // 样品属性
-      planDeliverTime: 'test', // 预计送达时间
-      deliverTime: 'test', // 实际送达时间
-      requireOverTime: 'test', // 要求检完时间
-      currentCertifications: '1', // 已出具证书总数
-      requireCertifications: '5', // 应出具证书总数
-      currentDeliver: 'test', // 当前检定环节
-    }].map((item: IinterchangeList) => {
-    return {
-      ...item,
-      Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
-    }
+  listQuery.value.sampleStatus = active.value
+  getInterChangeList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IinterchangeList) => {
+      return {
+        ...item,
+        Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
+        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
 }
 
@@ -166,17 +172,18 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    orderCode: '', // 委托书编号
+    orderNo: '', // 委托书编号
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    type: currentMenu.value,
+    sampleBelong: '', // 样品属性
+    sampleStatus: '',
     offset: 1,
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 多选发生改变时
@@ -195,11 +202,17 @@
   fetchData(true)
 }
 
-// 监听buttonBox切换
+// 按钮切换
 const changeCurrentButton = (val: string) => {
-  currentMenu.value = val
-  console.log(currentMenu.value)
-
+  active.value = val
+  const currentMenuItem = menu.value.find(item => item.id === val)
+  if (val === '2') {
+    currentMenu.value = '已收入'
+  }
+  else {
+    currentMenu.value = currentMenuItem!.name
+  }
+  window.sessionStorage.setItem('interchangeActive', val)
   fetchData(true)
 }
 
@@ -223,13 +236,13 @@
     const params = {
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
-      orderCode: listQuery.value.orderCode, // 委托书编号
+      orderNo: listQuery.value.orderNo, // 委托书编号
       customerId: listQuery.value.customerId, // 委托方代码
       startTime: listQuery.value.startTime, // 预计送达开始时间
       endTime: listQuery.value.endTime, // 预计送达结束时间
       isUrgent: listQuery.value.isUrgent, // 是否加急
-      sampleAttr: listQuery.value.sampleAttr, // 样品属性
-      type: currentMenu.value,
+      sampleBelong: listQuery.value.sampleBelong, // 样品属性
+      sampleStatus: active.value, // 样品状态
       ids: checkoutList.value,
     }
     exportInterchangeList(params).then((res) => {
@@ -256,15 +269,15 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'delete') { // 无需检测
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -272,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -280,7 +293,17 @@
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
+        let status
+        if (currentMenu.value === '已收入') {
+          status = '1'
+        }
+        if (currentMenu.value === '待归还') {
+          status = '2'
+        }
+        if (currentMenu.value === '已归还') {
+          status = '5'
+        }
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -288,15 +311,15 @@
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '6' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'urge') { // 催办 ------------------- 后端未开发完
+        interchangeListUrge({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -304,12 +327,7 @@
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success(`已${title}`)
-            fetchData(true)
-          }
-        })
+        terminateRef.value.initDialog(row)
       }
     })
 }
@@ -317,9 +335,9 @@
 // 打印列表
 function printList() {
   // 打印列
-  let column = columnsTaking.value
-  if (currentMenu.value === 'taking') {
-    column = columns.value
+  let column = columns.value
+  if (currentMenu.value === '待收入') {
+    column = columnsTaking.value
   }
   const properties = column.map((item) => {
     return {
@@ -341,10 +359,19 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
+  $router.push(`/sample/${pageType}/${row.sampleId}`)
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict() // 字典
+  if (window.sessionStorage.getItem('interchangeActive')) {
+    active.value = window.sessionStorage.getItem('interchangeActive')!
+  }
+  else {
+    active.value = '1' // 待收入
+  }
+  fetchData(true) // 列表数据
+})
 </script>
 
 <template>
@@ -371,7 +398,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.orderCode"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           class="short-input"
           clearable
@@ -403,17 +430,17 @@
           <el-option
             v-for="item in isUrgentMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
           <el-option
             v-for="item in sampleAttrMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
@@ -421,21 +448,21 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === 'taking'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === 'took' || currentMenu === 'overtime') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === 'returning'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
-        :data="list" :total="total" :columns="currentMenu === 'taking' ? columnsTaking : columns" :query="listQuery"
+        :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="240">
+          <el-table-column label="操作" align="center" fixed="right" width="270">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === '待收入'"
                 size="small"
                 type="primary"
                 link
@@ -452,7 +479,7 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === 'taking' || currentMenu === 'took' || currentMenu === 'returning')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === '待收入' || currentMenu === '已收入' || currentMenu === '待归还')"
                 size="small"
                 link
                 type="primary"
@@ -461,7 +488,7 @@
                 标签绑定
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="primary"
@@ -470,7 +497,7 @@
                 收入
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="danger"
@@ -479,7 +506,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
                 size="small"
                 link
                 type="primary"
@@ -488,7 +515,7 @@
                 完成
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === 'returning'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === '待归还'"
                 size="small"
                 link
                 type="primary"
@@ -497,7 +524,7 @@
                 归还
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === 'returning' || currentMenu === 'took' || currentMenu === 'returned')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === '待归还' || currentMenu === '已收入' || currentMenu === '已归还')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +533,7 @@
                 回退
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === 'overtime'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === '已超期'"
                 size="small"
                 link
                 type="primary"
@@ -515,7 +542,7 @@
                 催办
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/terminate') && (currentMenu === 'took' || currentMenu === 'overtime')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/terminate')"
                 size="small"
                 link
                 type="primary"
@@ -528,7 +555,9 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <!-- 终止弹窗 -->
+    <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts
index a7df4fd..e5140a4 100644
--- a/src/views/business/schedule/interchange/interchange_interface.ts
+++ b/src/views/business/schedule/interchange/interchange_interface.ts
@@ -3,13 +3,13 @@
 export interface IListQuery {
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
-  orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   customerId: string // 委托方代码
   startTime: string // 预计送达开始时间
   endTime: string // 预计送达结束时间
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
-  type: string // 类型（buttonBox）
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 样品状态
   offset: number
   limit: number
 }
@@ -20,23 +20,25 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   customerId: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送检人
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   planDeliverTime: string // 预计送达时间
   deliverTime: string // 实际送达时间
   requireOverTime: string // 要求检完时间
-  currentCertifications: string | number // 已出具证书总数
+  alreadyCertifications: string | number // 已出具证书总数
   requireCertifications: string | number // 应出具证书总数
   currentDeliver: string // 当前检定环节
+  orderId: string | number // 委托书id
+  sampleId: string | number// 样品id
 }
 
 // 检定记录
 export interface SimpleMeasureRecord {
-  orderCode: string // 委托单编号
+  orderNo: string // 委托单编号
   orderTime: string // 委托单日期
   customerCode: string // 委托人代码
   customerName: string // 委托人名称
@@ -93,3 +95,10 @@
   measureResult?: string // 检定结果
 }
 
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 1c6231e..f80d0c5 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -86,7 +86,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" props="comments">
+          <el-form-item label="请输入退回原因" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
new file mode 100644
index 0000000..ef91bfd
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -0,0 +1,37 @@
+// 列表查询接口
+export interface IListQuery {
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  manufacturingNo: string	// 出厂编号
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  offset: number // 当前页
+  limit: number // 每页多少条
+}
+
+// 表格
+export interface IList {
+  id: string // 主键
+  originalRecordCode: string	// 原始记录单编号
+  originalRecordName: string // 原始记录名称
+  customerSampleInfo: { // 样品信息
+    sampleNo: string	// 样品编号
+    sampleName: string	// 样品名称
+    manufacturingNo: string	// 出厂编号
+    sampleModel: string // 样品型号
+  }
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  createTime: string // 创建时间
+  remark: string // 备注
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 48dd59c..98c4257 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -1,72 +1,78 @@
-<script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+<!-- 原始记录列表 -->
+<script lang="ts" setup name="PrimitiveLogList">
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import QrDialog from '@/components/QrDialog/index.vue'
+import type { IList, IListQuery, dictType } from './primitiveLogList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '', // 创建结束时间
-  createStartTime: '', // 创建开始时间
-  deptId: '', // 部门id
-  director: '', // 负责人
-  effectiveCompany: '', // 原始记录编号
-  ids: [], // 导出集合
-  trainEndTime: '', // 结束时间
-  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  trainStartTime: '', // 开始时间
-  testCategory: '', // 检测类别
+import { getDictByCode } from '@/api/system/dict'
+
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+// 查询条件
+const listQuery = ref<IListQuery>({
+  calibrationCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 多选选中
 const checkoutList = ref<string[]>([])
-const list = ref([]) // 数据列表
+const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
 
-const $router = useRouter()
+// 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = []
-  loadingTable.value = false
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name, // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
 }
-fetchData(true)
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
-const { proxy } = getCurrentInstance() as any
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
-  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
-  { text: '样品编号', value: 'text', align: 'center' },
-  { text: '样品名称', value: 'text', align: 'center' },
-  { text: '出厂编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '检校类别', value: 'text', align: 'center' },
-  { text: '创建人', value: 'text', align: 'center' },
-  { text: '创建时间', value: 'text', align: 'center' },
-  { text: '备注', value: 'text', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -75,53 +81,59 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '', // 创建结束时间
-    createStartTime: '', // 创建开始时间
-    deptId: '', // 部门id
-    director: '', // 负责人
-    effectiveCompany: '', // 原始记录编号
-    ids: [], // 导出集合
-    trainEndTime: '', // 结束时间
-    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    trainStartTime: '', // 开始时间
-    testCategory: '', // 检测类别
+    calibrationCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
-  trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      calibrationCategory: '',	// 校验类别
+      createUser: '',	// 创建人
+      manufacturingNo: '',	// 出厂编号
+      originalRecordCode: '',	// 原始记录单编号
+      sampleModel: '',	// 样品型号
+      sampleName: '',	// 样品名称
+      sampleNo: '',	// 样品编号
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    exportPrimitiveLogList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '原始记录列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  text: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IList, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/primitiveLogList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
-    `确认删除${row.text}吗？`,
+    `确认删除${row.originalRecordName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -130,28 +142,25 @@
     },
   )
     .then(() => {
-      // getListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      deletePrimitiveLogList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已删除')
+          fetchData(true)
+        }
+      })
     })
 }
 
-const handelClick = (text: string) => {}
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
+// 点击新建
 const add = () => {
   $router.push('/lab/primitiveLogList/add')
 }
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -162,6 +171,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -172,16 +182,21 @@
     }
   })
   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 => checkoutList.value.includes(item))
-    printJSON(printList, properties, '环境记录单列表')
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '原始记录单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
+})
 </script>
 
 <template>
@@ -189,57 +204,57 @@
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.effectiveCompany"
+          v-model.trim="listQuery.originalRecordCode"
           placeholder="原始记录编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.manufacturingNo"
           placeholder="出厂编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleModel"
           placeholder="型号"
           clearable
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.testCategory"
+          v-model="listQuery.calibrationCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
         >
           <el-option
-            v-for="item in testCategoryList"
-            :key="item.id"
+            v-for="item in mesureCategoryList"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"
+            :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.createUser"
           placeholder="创建人"
           clearable
         />
@@ -280,10 +295,10 @@
         @multiSelect="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/edit')"
                 size="small"
                 type="primary"
                 link
@@ -300,11 +315,11 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/delete')"
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c74b7dd..cd53837 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="EnvironmentalAdd">
+<script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -644,7 +644,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择检校时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -869,7 +869,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -883,7 +883,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
new file mode 100644
index 0000000..d5f85a0
--- /dev/null
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -0,0 +1,113 @@
+<!-- 终止操作 -->
+<script lang="ts" setup name="teminateDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import { interchangeListTerminate } from '../../../../api/business/schedule/interchangeList'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const formData = ref({
+  orderId: '', // 委托书id
+  reason: '', // 终止原因
+  sampleId: '', // 样品id
+  status: '5', // 样品状态
+})
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules = reactive<FormRules>({
+  reason: [{ required: true, message: '终止原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param orderId 委托书id
+ * @param sampleId 样品id
+ */
+function initDialog(row) {
+  // dataFormRef.value!.clearValidate()
+  formData.value.orderId = row.orderId
+  formData.value.sampleId = row.sampleId
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      // ElMessageBox.confirm(
+      //   '确认终止吗？',
+      //   '提示',
+      //   { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      // ).then(() => {
+      btnLoading.value = true
+      interchangeListTerminate(formData.value).then((res) => {
+        ElMessage.success('操作成功')
+        btnLoading.value = false
+        dialogVisible.value = false
+        emit('onSuccess')
+      }).catch((_) => {
+        btnLoading.value = false
+      })
+      // })
+    }
+  })
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="终止"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="请输入终止原因" prop="reason">
+            <el-input
+              v-model="formData.reason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm(dataFormRef)">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue
deleted file mode 100644
index dc864bd..0000000
--- a/src/views/business/schedule/interchange/buttonBox.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { DefaultProps } from 'element-plus'
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-// 按钮菜单
-const menu = [
-  { name: '待收入', id: 'taking' },
-  { name: '已收入', id: 'took' },
-  { name: '待归还', id: 'returning' },
-  { name: '已归还', id: 'returned' },
-  { name: '已超期', id: 'overtime' },
-]
-const current = ref('taking')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 76px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
deleted file mode 100644
index 27687fc..0000000
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ /dev/null
@@ -1,715 +0,0 @@
-<!-- 新建、编辑、详情 -->
-<script lang="ts" setup name="InterchangeEdit">
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ref } from 'vue'
-import { Search } from '@element-plus/icons-vue'
-import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
-import countries from '@/components/AddressSelect/country-code.json'
-import { UploadFile } from '@/api/measure/file'
-import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
-
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const pageType = ref('add') // 页面类型: add, edit, detail
-const countryList = ref(countries) // 国家列表
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
-const mesureCategoryMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const mesureCategoryList = [
-  {
-    label: '检定',
-    value: 'jd',
-  },
-  {
-    label: '检测',
-    value: 'jc',
-  },
-  {
-    label: '验收检定',
-    value: 'ysjd',
-  },
-  {
-    label: '抽检',
-    value: 'cj',
-  },
-  {
-    label: '校准',
-    value: 'jz',
-  },
-  {
-    label: '测试',
-    value: 'cs',
-  },
-  {
-    label: '验收校准',
-    value: 'ysjz',
-  },
-]// 校检类别
-const mesureResultList = [
-  {
-    label: '合格',
-    value: 'hg',
-  },
-  {
-    label: '修后合格',
-    value: 'xhhg',
-  },
-  {
-    label: '限用',
-    value: 'xy',
-  },
-  {
-    label: '准用',
-    value: 'zy',
-  },
-  {
-    label: '不合格',
-    value: 'bhg',
-  },
-  {
-    label: '漏检',
-    value: 'lj',
-  },
-  {
-    label: '逾期未检定',
-    value: 'yqwjd',
-  },
-]// 检定结果
-const mesureResultMap = {
-  hg: '合格',
-  xhhg: '修后合格',
-  xy: '限用',
-  zy: '准用',
-  bhg: '不合格',
-  lj: '漏检',
-  yqwjd: '逾期未检定',
-}// 检定结果字典
-const measureTypeList = [
-  {
-    label: '自检',
-    value: '1',
-  },
-  {
-    label: '外包',
-    value: '2',
-  },
-  {
-    label: '外检',
-    value: '3',
-  },
-]// 检定方式
-const dataForm: Ref<ISampleDetail> = ref({
-  id: '',
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 样品型号
-  manufacturingNo: '', // 出厂编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
-  manufacturer: '', // 生产厂家
-  manufacturerCountry: '', // 厂家国别
-  manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  // deliverer: '', // 送检人
-  // delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
-  remark: '', // 备注
-  minioFileName: '', // 说明书
-  labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-})
-const ruleFormRef = ref<FormInstance>()
-
-// 自定义校验规则--检定周期为正整数
-const validateMesurePeriod = (rule: any, value: any, callback: any) => {
-  if (value === '') {
-    callback()
-  }
-  else if (!(/(^[1-9]\d*$)/.test(value))) {
-    callback(new Error('请输入一个正整数'))
-  }
-  else {
-    callback()
-  }
-}
-
-// 校验规则
-const rules = reactive<FormRules>({
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
-  sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
-  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
-  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
-  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
-  postalCode: [{ required: true, message: '委托方邮编不能为空', trigger: 'blur' }],
-  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
-  mesureContent: [{ required: true, message: '检定项目不能为空', trigger: 'blur' }],
-  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-}) // 表单验证规则
-
-// 其他关联数据列表
-const dataList = ref({
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
-})
-
-// 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
-}
-// 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
-}
-
-// 菜单
-const menu: Menu[] = [
-  {
-    name: '检定记录',
-    columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
-    ],
-    list: 'measureRecords',
-    pagination: true,
-    searchFunc: fetchMeasureRecords,
-  },
-  {
-    name: '检定证书',
-    columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
-    ],
-    list: 'certificationRecords',
-    pagination: true,
-    searchFunc: fetchCertifications,
-  },
-]
-
-const currentMenu = ref('检定记录')
-const currentMenuObj = computed(() => {
-  return menu.find(item => item.name === currentMenu.value)
-})
-
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-
-// 打印表单
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '样品详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        dataForm.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-
-// 委托方代码获取焦点
-const customerNoFocus = () => {
-  visible.value = true
-}
-
-// 选好委托方
-const confirmCheckout = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.companyAddress = getValue.briefName
-  }
-}
-
-// 控制选择委托方对话框显隐
-const changeVisible = (val: boolean) => {
-  visible.value = val
-}
-
-// 保存
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        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)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取详情
-const getInfo = () => {
-  getSapmleDetail({ id: infoId.value }).then((res) => {
-    res.data = {
-      ABC: 'A',
-      companyAddress: '北京/北京市',
-      customerName: '京东集团',
-      customerNo: 'sygf202211290001',
-      id: '',
-      labelBind: '11222',
-      manufacturer: '北京某厂家',
-      manufacturerCountry: 'CN',
-      manufacturingDate: '2023-03',
-      manufacturingNo: '123121',
-      mesureCategory: 'jd',
-      mesureContent: '项目1',
-      mesurePeriod: '1',
-      mesureType: 'zj',
-      minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-      phone: '950618',
-      postalCode: 'test',
-      remark: '无备注',
-      sampleModel: '型号1',
-      sampleName: '样品1',
-      sampleNo: '',
-      measureResultCode: 'bhg',
-    }
-    // dataForm.value = res.data
-    // dataForm.value.measureResult = mesureResultMap[dataForm.value.measureResultCode]
-    // for (const item of menu) {
-    //   item.searchFunc()
-    // }
-  })
-}
-
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`样品-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <div id="form">
-        <el-form
-          ref="ruleFormRef"
-          :model="dataForm"
-          :label-width="120"
-          label-position="right"
-          :rules="rules"
-        >
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="样品编号:" prop="sampleNo">
-                <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="样品名称:" prop="sampleName">
-                <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col><el-col :span="6">
-              <el-form-item label="样品型号:" prop="sampleModel">
-                <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂编号:" prop="manufacturingNo">
-                <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方代码" prop="customerNo">
-                <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @focus="customerNoFocus"
-                >
-                  <template #suffix>
-                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
-                      <search />
-                    </el-icon>
-                  </template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方名称" prop="customerName">
-                <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话" prop="phone">
-                <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方邮编" prop="postalCode">
-                <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="18">
-              <el-form-item label="委托方地址:" prop="companyAddress">
-                <el-input
-                  v-model="dataForm.companyAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="校检类别:">
-                <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="生产厂家:">
-                <el-input
-                  v-model="dataForm.manufacturer"
-                  :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.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂年月:">
-                <el-date-picker
-                  v-model="dataForm.manufacturingDate"
-                  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="ABC:">
-                <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="检定周期（月）:" prop="mesurePeriod">
-                <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="送检人:">
-                <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="联系方式:">
-                <el-input
-                  v-model="dataForm.delivererTel"
-                  :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"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标签绑定:">
-                <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="检定项目:" prop="mesureContent">
-                <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="备注:">
-                <el-input
-                  v-model="dataForm.remark"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </detail-page>
-
-    <!-- 检定记录、检定证书 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
-      <template #menu>
-        <el-radio-group v-model="currentMenu">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </template>
-      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
-    </detail-block-switch>
-
-    <!-- 选择委托方组件 -->
-    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 6e5c9b9..6b3eb34 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -1,88 +1,74 @@
+<!-- 设备收发列表 -->
 <script lang="ts" setup name="InterchangeList">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IListQuery, IinterchangeList } from './interchange_interface'
-import ButtonBox from './buttonBox.vue'
+import teminateDialog from '../components/terminateDialog.vue'
+import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   exportInterchangeList,
   getInterChangeList,
-  interchangeListBack,
-  interchangeListComplete,
-  interchangeListDelete,
-  interchangeListReturn,
-  interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
+  interchangeStatusChange,
 } from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import buttonBox from '@/components/buttonBox/buttonBox.vue'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
-
-// 是否加急
-const isUrgentMap = [
-  { label: '全部', value: '0' },
-  { label: '是', value: '1' },
-  { label: '否', value: '2' },
-]
-
-// 样品属性
-const sampleAttrMap = [
-  { label: '全部', value: '0' },
-  { label: '客户样品', value: '1' },
-  { label: '自有设备', value: '2' },
-]
-
-const currentMenu = ref('taking') // buttonBox菜单选中项
+const menu = ref<IMenu[]>([]) // 右上角菜单
+const currentMenu = ref('') // 选中的按钮
+const active = ref('') // 选中的按钮的code
+const terminateRef = ref() // 确认终止dialog
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
-  type: '',
+  sampleBelong: '', // 样品属性
+  sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
 // 表头待收入
 const columnsTaking = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
-
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '实际送达时间', value: 'deliverTime', align: 'center' },
+  { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
-  { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
 ])
 
@@ -94,66 +80,86 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
+const isUrgentMap = ref<dictType[]>([]) // 是否加急
+const sampleAttrMap = ref<dictType[]>([]) // 样品属性
+const sampleStatusMap = ref<dictType[]>([]) // 样品状态
+
+// 获取字典值
+async function getDict() {
+  // 是否加急
+  getDictByCode('isUrgent').then((response) => {
+    isUrgentMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value,
+      }
+    })
+    // 在已有的字典的基础上增加一个全部0进去
+    isUrgentMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2', // 是否加急全部后端定为2
+    })
+  })
+  // 样品属性
+  getDictByCode('sampleBelong').then((response) => {
+    sampleAttrMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value, // 后端需要int型，在此转换
+      }
+    })
+    // 在已有的字典的基础上增加一个全部进去
+    sampleAttrMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2',
+    })
+  })
+  // 样品状态
+  const res = await getDictByCode('sampleStatus')
+  sampleStatusMap.value = res.data.map((item: dictType) => {
+    return {
+      ...item,
+      value: parseInt(item.value as string), // 后端需要int型，在此转换
+    }
+  })
+  // 制作右上角的菜单
+  sampleStatusMap.value.forEach((item: dictType) => {
+    if (item.name === '待收入' || item.name === '待归还'
+      || item.name === '已归还' || item.name === '已超期') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+  menu.value.splice(1, 0, {
+    name: '已收入',
+    id: '2', // 后端规定已收入传2
+  })
+}
+
 // 数据查询
 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 || ''
-  listQuery.value.type = currentMenu.value
-  // getInterChangeList(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', // 预计送达时间
-  //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: 'test',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      orderCode: 'test', // 委托书编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      deliverer: 'test', // 送检人
-      isUrgent: '1', // 是否加急
-      sampleAttr: '1', // 样品属性
-      planDeliverTime: 'test', // 预计送达时间
-      deliverTime: 'test', // 实际送达时间
-      requireOverTime: 'test', // 要求检完时间
-      currentCertifications: '1', // 已出具证书总数
-      requireCertifications: '5', // 应出具证书总数
-      currentDeliver: 'test', // 当前检定环节
-    }].map((item: IinterchangeList) => {
-    return {
-      ...item,
-      Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
-    }
+  listQuery.value.sampleStatus = active.value
+  getInterChangeList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IinterchangeList) => {
+      return {
+        ...item,
+        Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
+        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
 }
 
@@ -166,17 +172,18 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    orderCode: '', // 委托书编号
+    orderNo: '', // 委托书编号
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    type: currentMenu.value,
+    sampleBelong: '', // 样品属性
+    sampleStatus: '',
     offset: 1,
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 多选发生改变时
@@ -195,11 +202,17 @@
   fetchData(true)
 }
 
-// 监听buttonBox切换
+// 按钮切换
 const changeCurrentButton = (val: string) => {
-  currentMenu.value = val
-  console.log(currentMenu.value)
-
+  active.value = val
+  const currentMenuItem = menu.value.find(item => item.id === val)
+  if (val === '2') {
+    currentMenu.value = '已收入'
+  }
+  else {
+    currentMenu.value = currentMenuItem!.name
+  }
+  window.sessionStorage.setItem('interchangeActive', val)
   fetchData(true)
 }
 
@@ -223,13 +236,13 @@
     const params = {
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
-      orderCode: listQuery.value.orderCode, // 委托书编号
+      orderNo: listQuery.value.orderNo, // 委托书编号
       customerId: listQuery.value.customerId, // 委托方代码
       startTime: listQuery.value.startTime, // 预计送达开始时间
       endTime: listQuery.value.endTime, // 预计送达结束时间
       isUrgent: listQuery.value.isUrgent, // 是否加急
-      sampleAttr: listQuery.value.sampleAttr, // 样品属性
-      type: currentMenu.value,
+      sampleBelong: listQuery.value.sampleBelong, // 样品属性
+      sampleStatus: active.value, // 样品状态
       ids: checkoutList.value,
     }
     exportInterchangeList(params).then((res) => {
@@ -256,15 +269,15 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'delete') { // 无需检测
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -272,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -280,7 +293,17 @@
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
+        let status
+        if (currentMenu.value === '已收入') {
+          status = '1'
+        }
+        if (currentMenu.value === '待归还') {
+          status = '2'
+        }
+        if (currentMenu.value === '已归还') {
+          status = '5'
+        }
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -288,15 +311,15 @@
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '6' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'urge') { // 催办 ------------------- 后端未开发完
+        interchangeListUrge({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -304,12 +327,7 @@
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success(`已${title}`)
-            fetchData(true)
-          }
-        })
+        terminateRef.value.initDialog(row)
       }
     })
 }
@@ -317,9 +335,9 @@
 // 打印列表
 function printList() {
   // 打印列
-  let column = columnsTaking.value
-  if (currentMenu.value === 'taking') {
-    column = columns.value
+  let column = columns.value
+  if (currentMenu.value === '待收入') {
+    column = columnsTaking.value
   }
   const properties = column.map((item) => {
     return {
@@ -341,10 +359,19 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
+  $router.push(`/sample/${pageType}/${row.sampleId}`)
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict() // 字典
+  if (window.sessionStorage.getItem('interchangeActive')) {
+    active.value = window.sessionStorage.getItem('interchangeActive')!
+  }
+  else {
+    active.value = '1' // 待收入
+  }
+  fetchData(true) // 列表数据
+})
 </script>
 
 <template>
@@ -371,7 +398,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.orderCode"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           class="short-input"
           clearable
@@ -403,17 +430,17 @@
           <el-option
             v-for="item in isUrgentMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
           <el-option
             v-for="item in sampleAttrMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
@@ -421,21 +448,21 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === 'taking'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === 'took' || currentMenu === 'overtime') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === 'returning'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
-        :data="list" :total="total" :columns="currentMenu === 'taking' ? columnsTaking : columns" :query="listQuery"
+        :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="240">
+          <el-table-column label="操作" align="center" fixed="right" width="270">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === '待收入'"
                 size="small"
                 type="primary"
                 link
@@ -452,7 +479,7 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === 'taking' || currentMenu === 'took' || currentMenu === 'returning')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === '待收入' || currentMenu === '已收入' || currentMenu === '待归还')"
                 size="small"
                 link
                 type="primary"
@@ -461,7 +488,7 @@
                 标签绑定
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="primary"
@@ -470,7 +497,7 @@
                 收入
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="danger"
@@ -479,7 +506,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
                 size="small"
                 link
                 type="primary"
@@ -488,7 +515,7 @@
                 完成
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === 'returning'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === '待归还'"
                 size="small"
                 link
                 type="primary"
@@ -497,7 +524,7 @@
                 归还
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === 'returning' || currentMenu === 'took' || currentMenu === 'returned')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === '待归还' || currentMenu === '已收入' || currentMenu === '已归还')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +533,7 @@
                 回退
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === 'overtime'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === '已超期'"
                 size="small"
                 link
                 type="primary"
@@ -515,7 +542,7 @@
                 催办
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/terminate') && (currentMenu === 'took' || currentMenu === 'overtime')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/terminate')"
                 size="small"
                 link
                 type="primary"
@@ -528,7 +555,9 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <!-- 终止弹窗 -->
+    <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts
index a7df4fd..e5140a4 100644
--- a/src/views/business/schedule/interchange/interchange_interface.ts
+++ b/src/views/business/schedule/interchange/interchange_interface.ts
@@ -3,13 +3,13 @@
 export interface IListQuery {
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
-  orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   customerId: string // 委托方代码
   startTime: string // 预计送达开始时间
   endTime: string // 预计送达结束时间
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
-  type: string // 类型（buttonBox）
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 样品状态
   offset: number
   limit: number
 }
@@ -20,23 +20,25 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   customerId: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送检人
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   planDeliverTime: string // 预计送达时间
   deliverTime: string // 实际送达时间
   requireOverTime: string // 要求检完时间
-  currentCertifications: string | number // 已出具证书总数
+  alreadyCertifications: string | number // 已出具证书总数
   requireCertifications: string | number // 应出具证书总数
   currentDeliver: string // 当前检定环节
+  orderId: string | number // 委托书id
+  sampleId: string | number// 样品id
 }
 
 // 检定记录
 export interface SimpleMeasureRecord {
-  orderCode: string // 委托单编号
+  orderNo: string // 委托单编号
   orderTime: string // 委托单日期
   customerCode: string // 委托人代码
   customerName: string // 委托人名称
@@ -93,3 +95,10 @@
   measureResult?: string // 检定结果
 }
 
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 2b57a17..ed11f7e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,23 +1,36 @@
-<script lang="ts" setup name="CustomerList">
+<script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import type { IReceiptDetail, dictType } from './receiptList-interface'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
+import selectOrder from './selectOrder.vue'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import selectSample from '@/views/business/schedule/order/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
-import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import BarCodeBind from '@/components/BarCodeBind/index.vue'
+import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
-const visible = ref(false) // 控制选择委托方对话框显隐
+const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const orderVisible = ref(false) // 控制委托书对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
-
-const ruleFormRef = ref()
+const minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
 // 表单
 const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -28,7 +41,7 @@
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方邮编
+  fax: '', // 委托方传真
   postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
   deliverer: '', // 送检人
@@ -41,9 +54,69 @@
   appearance: '', // 样品外观
   relyFile: '', // 依据文件
 })
+// 表单验证规则
+const rules = reactive<FormRules>({
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
+  certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
+  certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
+  certificationCompanyAddress: [{ required: true, message: '要求证书单位地址不能为空', trigger: 'blur' }],
+  reciever: [{ required: true, message: '要求接收人不能为空', trigger: 'blur' }],
+  recieverPhone: [{ required: true, message: '要求接收人电话/手机不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  fax: [{ required: true, message: '要求委托方传真不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  deliverer: [{ required: true, message: '要求送检人不能为空', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '要求送检人电话/手机不能为空', trigger: 'blur' }],
+  orderTime: [{ type: 'date', required: true, message: '要求委托日期不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', required: true, message: '要求完成时间不能为空', trigger: 'change' }],
+  deliverTime: [{ type: 'date', required: true, message: '要求交接时间不能为空', trigger: 'change' }],
+  measureCategory: [{ required: true, message: '要求校检类别不能为空', trigger: 'change' }],
+  secrecy: [{ required: true, message: '要求保密要求不能为空', trigger: 'change' }],
+})
+const list = ref<ISampleList[]>([])// 表格数据-样品
+// 选中的内容
+const checkoutList = ref([])
+// 表头
+const columns = ref([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号', value: 'sampleModel', align: 'center', required: true },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '外观', value: 'appearance', align: 'center' },
+  { text: '检定要求', value: 'measureRequire', align: 'center' },
+])
+
+// 签章查询数据
+const searchQuerySignature = reactive<queryType>({
+  signNo: 'qmqz202212050009', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '', // 1签名、2签章
+})
+// 签名查询数据
+const searchQueryAutograph = reactive<queryType>({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
 
 // 获取字典值
-function getDict() {
+async function getDict() {
   // 校检类别
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
@@ -77,8 +150,31 @@
   getDictByCode('secrecy').then((response) => {
     secrecyList.value = response.data
   })
+  // 获取类型（签名、签章）
+  const res = await getDictByCode('signType')
+  searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+  searchQueryAutograph.signType = res.data.filter((item: typeofSign) => item.name === '签名')[0].value
+  console.log(res.data.filter((item: typeofSign) => item.name === '签章')[0].value)
+  console.log(searchQuerySignature.signType)
+  console.log(searchQueryAutograph.signType)
 }
-getDict()
+
+// 获取签章数据
+const getSignatureList = () => {
+  listPageApi(searchQuerySignature).then((res) => {
+    if (res.code === 200) {
+      minioFileNameSignature.value = res.data.rows[0].minioFileName
+    }
+  })
+}
+// 获取签名数据
+const getAutographList = () => {
+  listPageApi(searchQueryAutograph).then((res) => {
+    if (res.code === 200) {
+      minioFileNameAutograph.value = res.data.rows[0].minioFileName
+    }
+  })
+}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
@@ -95,34 +191,148 @@
   $router.back()
 }
 
-// 选好委托方
-const confirmCheckout = (val: Array<ICustomer>) => {
-  // if (val && val.length) {
-  //   list.value = [] // 切换委托方时把样品清单置空
-  //   const getValue = val[0]
-  //   dataForm.value.customerNo = getValue.customerNo // 委托方代码
-  //   dataForm.value.customerId = getValue.id // 委托方id
-  //   dataForm.value.customerName = getValue.customerName // 委托方名称
-  //   dataForm.value.phone = getValue.phone // 委托方电话
-  //   dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
-  // }
-}
-
 // 点击提交
 const submit = () => {}
 
+// ------------------------委托书-----------------------------
 // 点击选择委托书编号
-const selectOrder = () => {
-
+const handleClickOrder = () => {
+  orderVisible.value = true
 }
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+  }
+}
+
+// ------------------------委托方-----------------------------
+// 点击选择委托方编号
+const handleClickCustomer = () => {
+  customerVisible.value = true
+}
+// 修改委托方对话框显隐
+const changeCustomerVisible = (val: boolean) => {
+  customerVisible.value = val
+}
+// 选好委托方
+const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    list.value = [] // 切换委托方时把样品清单置空
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
+    dataForm.value.fax = getValue.fax // 委托方传真
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// ------------------------样品-----------------------------
+// 点击批量增加
+const multiAdd = () => {
+  sampleVisible.value = true
+}
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: Array<ISampleList>) => {
+  if (val && val.length) {
+    val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+      if (index === -1) {
+        list.value.push({
+          ...item,
+        })
+      }
+    })
+  }
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index !== -1) {
+      list.value.splice(index, 1)
+    }
+  })
+}
+
+// 点击保存
+const saveForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (pageType.value === 'edit') { // 编辑
+          // updateOrder(params).then(() => {
+          //   ElMessage.success('已保存')
+          //   $router.go(-1)
+          // })
+        }
+        if (pageType.value === 'add') { // 新建
+          // addOrder(params).then(() => {
+          //   ElMessage.success('已保存')
+          //   $router.go(-1)
+          // })
+        }
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+// 接收人表单失去焦点--调用签名管理数据
+const receiverBlur = () => {
+  getAutographList()
+}
+
+onMounted(async () => {
+  if (pageType.value === 'add') {
+    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+  }
+  await getDict()
+  getSignatureList()
+})
 </script>
 
 <template>
   <app-container>
     <div id="main">
-      <div class="orderNo-title">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
         <span>交接单编号：</span>
-        <span>11111111</span>
+        <span>{{ dataForm.interchangeCode }}</span>
       </div>
       <div class="customer-title">
         <img src="@/assets/images/logo.png" class="img">
@@ -132,9 +342,6 @@
       </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="submit">
-            提交
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
           </el-button>
@@ -148,6 +355,7 @@
             :model="dataForm"
             :label-width="120"
             label-position="right"
+            :rules="rules"
           >
             <el-row :gutter="24">
               <el-col :span="6">
@@ -159,7 +367,7 @@
                     disabled
                   >
                     <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="selectOrder">
+                      <el-button size="small" @click="handleClickOrder">
                         选择
                       </el-button>
                     </template>
@@ -211,8 +419,6 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
                   <el-input
@@ -220,6 +426,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
+                    @blur="receiverBlur"
                   />
                 </el-form-item>
               </el-col>
@@ -234,6 +441,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
+
             <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="委托方代码:" prop="customerNo">
@@ -244,7 +452,7 @@
                     disabled
                   >
                     <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="selectCustomer">
+                      <el-button size="small" @click="handleClickCustomer">
                         选择
                       </el-button>
                     </template>
@@ -295,8 +503,6 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <el-input
@@ -317,6 +523,8 @@
                   />
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -327,7 +535,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
@@ -416,19 +624,19 @@
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="样品清单">
+      <detail-block title="被测样品列表">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            从样品库中添加
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-            增加行
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
             删除行
           </el-button>
         </template>
-        <!-- <el-table
+        <el-table
           :data="list"
           border
           style="width: 100%;"
@@ -445,33 +653,37 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
-                v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
-                :disabled="item.disabled"
-                class="input"
-              />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
-                <el-option
-                  v-for="i in powerVoltageMap"
-                  :key="i.value"
-                  :label="i.name"
-                  :value="i.value"
-                />
-              </el-select>
-              <span v-if="item.value === 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-            </template>
-          </el-table-column>
-        </el-table> -->
+          />
+        </el-table>
       </detail-block>
+      <!-- 签章部分 -->
+      <div class="receipt-signature">
+        <div class="content">
+          <span class="title">甲方</span>
+          <div class="deliverer-time">
+            <span class="text-title">送检人:</span>
+            <span class="time">时ㅤ间:</span>
+          </div>
+        </div>
+        <div class="content">
+          <span class="title">乙方</span>
 
+          <div class="deliverer-time">
+            <div class="img">
+              <show-photo height="111px" width="183px" :minio-file-name="minioFileNameSignature" />
+            </div>
+            <div class="img-name">
+              <show-photo height="100px" width="200px" :minio-file-name="minioFileNameAutograph" />
+            </div>
+
+            <span class="text-title">接收人:</span>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
       <!-- 公司信息 -->
       <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
@@ -485,13 +697,22 @@
       </div>
     </div>
     <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" /> -->
+    <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <!-- <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" /> -->
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 标签绑定 -->
+    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
+.orderNo-title {
+  font-size: 13px;
+  color: #606266;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
@@ -529,4 +750,58 @@
     }
   }
 }
+
+.receipt-signature {
+  display: flex;
+  justify-content: space-around;
+  // padding: 50px 250px 50px 150px;
+  padding: 50px;
+  font-size: 28px;
+  color: #000;
+  font-weight: 600;
+
+  .content {
+    display: flex;
+    position: relative;
+
+    .img {
+      position: absolute;
+      right: 0;
+      top: 0;
+      z-index: 2;
+    }
+
+    .img-name {
+      position: absolute;
+      left: 220px;
+      top: -30px;
+      z-index: 1;
+    }
+
+    .title {
+      margin-right: 32px;
+      letter-spacing: 6px;
+    }
+
+    .deliverer-time {
+      display: flex;
+      flex-direction: column;
+
+      .text-title {
+        letter-spacing: 2px;
+      }
+
+      .time {
+        margin-top: 30px;
+        letter-spacing: 2px;
+      }
+
+      .text {
+        font-size: 24px;
+        font-weight: 500;
+        margin-left: 10px;
+      }
+    }
+  }
+}
 </style>

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 1c6231e..f80d0c5 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -86,7 +86,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" props="comments">
+          <el-form-item label="请输入退回原因" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
new file mode 100644
index 0000000..ef91bfd
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -0,0 +1,37 @@
+// 列表查询接口
+export interface IListQuery {
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  manufacturingNo: string	// 出厂编号
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  offset: number // 当前页
+  limit: number // 每页多少条
+}
+
+// 表格
+export interface IList {
+  id: string // 主键
+  originalRecordCode: string	// 原始记录单编号
+  originalRecordName: string // 原始记录名称
+  customerSampleInfo: { // 样品信息
+    sampleNo: string	// 样品编号
+    sampleName: string	// 样品名称
+    manufacturingNo: string	// 出厂编号
+    sampleModel: string // 样品型号
+  }
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  createTime: string // 创建时间
+  remark: string // 备注
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 48dd59c..98c4257 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -1,72 +1,78 @@
-<script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+<!-- 原始记录列表 -->
+<script lang="ts" setup name="PrimitiveLogList">
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import QrDialog from '@/components/QrDialog/index.vue'
+import type { IList, IListQuery, dictType } from './primitiveLogList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '', // 创建结束时间
-  createStartTime: '', // 创建开始时间
-  deptId: '', // 部门id
-  director: '', // 负责人
-  effectiveCompany: '', // 原始记录编号
-  ids: [], // 导出集合
-  trainEndTime: '', // 结束时间
-  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  trainStartTime: '', // 开始时间
-  testCategory: '', // 检测类别
+import { getDictByCode } from '@/api/system/dict'
+
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+// 查询条件
+const listQuery = ref<IListQuery>({
+  calibrationCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 多选选中
 const checkoutList = ref<string[]>([])
-const list = ref([]) // 数据列表
+const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
 
-const $router = useRouter()
+// 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = []
-  loadingTable.value = false
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name, // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
 }
-fetchData(true)
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
-const { proxy } = getCurrentInstance() as any
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
-  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
-  { text: '样品编号', value: 'text', align: 'center' },
-  { text: '样品名称', value: 'text', align: 'center' },
-  { text: '出厂编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '检校类别', value: 'text', align: 'center' },
-  { text: '创建人', value: 'text', align: 'center' },
-  { text: '创建时间', value: 'text', align: 'center' },
-  { text: '备注', value: 'text', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -75,53 +81,59 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '', // 创建结束时间
-    createStartTime: '', // 创建开始时间
-    deptId: '', // 部门id
-    director: '', // 负责人
-    effectiveCompany: '', // 原始记录编号
-    ids: [], // 导出集合
-    trainEndTime: '', // 结束时间
-    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    trainStartTime: '', // 开始时间
-    testCategory: '', // 检测类别
+    calibrationCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
-  trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      calibrationCategory: '',	// 校验类别
+      createUser: '',	// 创建人
+      manufacturingNo: '',	// 出厂编号
+      originalRecordCode: '',	// 原始记录单编号
+      sampleModel: '',	// 样品型号
+      sampleName: '',	// 样品名称
+      sampleNo: '',	// 样品编号
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    exportPrimitiveLogList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '原始记录列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  text: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IList, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/primitiveLogList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
-    `确认删除${row.text}吗？`,
+    `确认删除${row.originalRecordName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -130,28 +142,25 @@
     },
   )
     .then(() => {
-      // getListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      deletePrimitiveLogList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已删除')
+          fetchData(true)
+        }
+      })
     })
 }
 
-const handelClick = (text: string) => {}
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
+// 点击新建
 const add = () => {
   $router.push('/lab/primitiveLogList/add')
 }
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -162,6 +171,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -172,16 +182,21 @@
     }
   })
   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 => checkoutList.value.includes(item))
-    printJSON(printList, properties, '环境记录单列表')
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '原始记录单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
+})
 </script>
 
 <template>
@@ -189,57 +204,57 @@
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.effectiveCompany"
+          v-model.trim="listQuery.originalRecordCode"
           placeholder="原始记录编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.manufacturingNo"
           placeholder="出厂编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleModel"
           placeholder="型号"
           clearable
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.testCategory"
+          v-model="listQuery.calibrationCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
         >
           <el-option
-            v-for="item in testCategoryList"
-            :key="item.id"
+            v-for="item in mesureCategoryList"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"
+            :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.createUser"
           placeholder="创建人"
           clearable
         />
@@ -280,10 +295,10 @@
         @multiSelect="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/edit')"
                 size="small"
                 type="primary"
                 link
@@ -300,11 +315,11 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/delete')"
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c74b7dd..cd53837 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="EnvironmentalAdd">
+<script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -644,7 +644,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择检校时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -869,7 +869,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -883,7 +883,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
new file mode 100644
index 0000000..d5f85a0
--- /dev/null
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -0,0 +1,113 @@
+<!-- 终止操作 -->
+<script lang="ts" setup name="teminateDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import { interchangeListTerminate } from '../../../../api/business/schedule/interchangeList'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const formData = ref({
+  orderId: '', // 委托书id
+  reason: '', // 终止原因
+  sampleId: '', // 样品id
+  status: '5', // 样品状态
+})
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules = reactive<FormRules>({
+  reason: [{ required: true, message: '终止原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param orderId 委托书id
+ * @param sampleId 样品id
+ */
+function initDialog(row) {
+  // dataFormRef.value!.clearValidate()
+  formData.value.orderId = row.orderId
+  formData.value.sampleId = row.sampleId
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      // ElMessageBox.confirm(
+      //   '确认终止吗？',
+      //   '提示',
+      //   { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      // ).then(() => {
+      btnLoading.value = true
+      interchangeListTerminate(formData.value).then((res) => {
+        ElMessage.success('操作成功')
+        btnLoading.value = false
+        dialogVisible.value = false
+        emit('onSuccess')
+      }).catch((_) => {
+        btnLoading.value = false
+      })
+      // })
+    }
+  })
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="终止"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="请输入终止原因" prop="reason">
+            <el-input
+              v-model="formData.reason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm(dataFormRef)">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue
deleted file mode 100644
index dc864bd..0000000
--- a/src/views/business/schedule/interchange/buttonBox.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { DefaultProps } from 'element-plus'
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-// 按钮菜单
-const menu = [
-  { name: '待收入', id: 'taking' },
-  { name: '已收入', id: 'took' },
-  { name: '待归还', id: 'returning' },
-  { name: '已归还', id: 'returned' },
-  { name: '已超期', id: 'overtime' },
-]
-const current = ref('taking')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 76px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
deleted file mode 100644
index 27687fc..0000000
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ /dev/null
@@ -1,715 +0,0 @@
-<!-- 新建、编辑、详情 -->
-<script lang="ts" setup name="InterchangeEdit">
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ref } from 'vue'
-import { Search } from '@element-plus/icons-vue'
-import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
-import countries from '@/components/AddressSelect/country-code.json'
-import { UploadFile } from '@/api/measure/file'
-import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
-
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const pageType = ref('add') // 页面类型: add, edit, detail
-const countryList = ref(countries) // 国家列表
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
-const mesureCategoryMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const mesureCategoryList = [
-  {
-    label: '检定',
-    value: 'jd',
-  },
-  {
-    label: '检测',
-    value: 'jc',
-  },
-  {
-    label: '验收检定',
-    value: 'ysjd',
-  },
-  {
-    label: '抽检',
-    value: 'cj',
-  },
-  {
-    label: '校准',
-    value: 'jz',
-  },
-  {
-    label: '测试',
-    value: 'cs',
-  },
-  {
-    label: '验收校准',
-    value: 'ysjz',
-  },
-]// 校检类别
-const mesureResultList = [
-  {
-    label: '合格',
-    value: 'hg',
-  },
-  {
-    label: '修后合格',
-    value: 'xhhg',
-  },
-  {
-    label: '限用',
-    value: 'xy',
-  },
-  {
-    label: '准用',
-    value: 'zy',
-  },
-  {
-    label: '不合格',
-    value: 'bhg',
-  },
-  {
-    label: '漏检',
-    value: 'lj',
-  },
-  {
-    label: '逾期未检定',
-    value: 'yqwjd',
-  },
-]// 检定结果
-const mesureResultMap = {
-  hg: '合格',
-  xhhg: '修后合格',
-  xy: '限用',
-  zy: '准用',
-  bhg: '不合格',
-  lj: '漏检',
-  yqwjd: '逾期未检定',
-}// 检定结果字典
-const measureTypeList = [
-  {
-    label: '自检',
-    value: '1',
-  },
-  {
-    label: '外包',
-    value: '2',
-  },
-  {
-    label: '外检',
-    value: '3',
-  },
-]// 检定方式
-const dataForm: Ref<ISampleDetail> = ref({
-  id: '',
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 样品型号
-  manufacturingNo: '', // 出厂编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
-  manufacturer: '', // 生产厂家
-  manufacturerCountry: '', // 厂家国别
-  manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  // deliverer: '', // 送检人
-  // delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
-  remark: '', // 备注
-  minioFileName: '', // 说明书
-  labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-})
-const ruleFormRef = ref<FormInstance>()
-
-// 自定义校验规则--检定周期为正整数
-const validateMesurePeriod = (rule: any, value: any, callback: any) => {
-  if (value === '') {
-    callback()
-  }
-  else if (!(/(^[1-9]\d*$)/.test(value))) {
-    callback(new Error('请输入一个正整数'))
-  }
-  else {
-    callback()
-  }
-}
-
-// 校验规则
-const rules = reactive<FormRules>({
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
-  sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
-  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
-  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
-  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
-  postalCode: [{ required: true, message: '委托方邮编不能为空', trigger: 'blur' }],
-  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
-  mesureContent: [{ required: true, message: '检定项目不能为空', trigger: 'blur' }],
-  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-}) // 表单验证规则
-
-// 其他关联数据列表
-const dataList = ref({
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
-})
-
-// 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
-}
-// 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
-}
-
-// 菜单
-const menu: Menu[] = [
-  {
-    name: '检定记录',
-    columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
-    ],
-    list: 'measureRecords',
-    pagination: true,
-    searchFunc: fetchMeasureRecords,
-  },
-  {
-    name: '检定证书',
-    columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
-    ],
-    list: 'certificationRecords',
-    pagination: true,
-    searchFunc: fetchCertifications,
-  },
-]
-
-const currentMenu = ref('检定记录')
-const currentMenuObj = computed(() => {
-  return menu.find(item => item.name === currentMenu.value)
-})
-
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-
-// 打印表单
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '样品详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        dataForm.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-
-// 委托方代码获取焦点
-const customerNoFocus = () => {
-  visible.value = true
-}
-
-// 选好委托方
-const confirmCheckout = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.companyAddress = getValue.briefName
-  }
-}
-
-// 控制选择委托方对话框显隐
-const changeVisible = (val: boolean) => {
-  visible.value = val
-}
-
-// 保存
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        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)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取详情
-const getInfo = () => {
-  getSapmleDetail({ id: infoId.value }).then((res) => {
-    res.data = {
-      ABC: 'A',
-      companyAddress: '北京/北京市',
-      customerName: '京东集团',
-      customerNo: 'sygf202211290001',
-      id: '',
-      labelBind: '11222',
-      manufacturer: '北京某厂家',
-      manufacturerCountry: 'CN',
-      manufacturingDate: '2023-03',
-      manufacturingNo: '123121',
-      mesureCategory: 'jd',
-      mesureContent: '项目1',
-      mesurePeriod: '1',
-      mesureType: 'zj',
-      minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-      phone: '950618',
-      postalCode: 'test',
-      remark: '无备注',
-      sampleModel: '型号1',
-      sampleName: '样品1',
-      sampleNo: '',
-      measureResultCode: 'bhg',
-    }
-    // dataForm.value = res.data
-    // dataForm.value.measureResult = mesureResultMap[dataForm.value.measureResultCode]
-    // for (const item of menu) {
-    //   item.searchFunc()
-    // }
-  })
-}
-
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`样品-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <div id="form">
-        <el-form
-          ref="ruleFormRef"
-          :model="dataForm"
-          :label-width="120"
-          label-position="right"
-          :rules="rules"
-        >
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="样品编号:" prop="sampleNo">
-                <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="样品名称:" prop="sampleName">
-                <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col><el-col :span="6">
-              <el-form-item label="样品型号:" prop="sampleModel">
-                <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂编号:" prop="manufacturingNo">
-                <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方代码" prop="customerNo">
-                <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @focus="customerNoFocus"
-                >
-                  <template #suffix>
-                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
-                      <search />
-                    </el-icon>
-                  </template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方名称" prop="customerName">
-                <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话" prop="phone">
-                <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方邮编" prop="postalCode">
-                <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="18">
-              <el-form-item label="委托方地址:" prop="companyAddress">
-                <el-input
-                  v-model="dataForm.companyAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="校检类别:">
-                <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="生产厂家:">
-                <el-input
-                  v-model="dataForm.manufacturer"
-                  :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.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂年月:">
-                <el-date-picker
-                  v-model="dataForm.manufacturingDate"
-                  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="ABC:">
-                <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="检定周期（月）:" prop="mesurePeriod">
-                <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="送检人:">
-                <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="联系方式:">
-                <el-input
-                  v-model="dataForm.delivererTel"
-                  :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"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标签绑定:">
-                <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="检定项目:" prop="mesureContent">
-                <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="备注:">
-                <el-input
-                  v-model="dataForm.remark"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </detail-page>
-
-    <!-- 检定记录、检定证书 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
-      <template #menu>
-        <el-radio-group v-model="currentMenu">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </template>
-      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
-    </detail-block-switch>
-
-    <!-- 选择委托方组件 -->
-    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 6e5c9b9..6b3eb34 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -1,88 +1,74 @@
+<!-- 设备收发列表 -->
 <script lang="ts" setup name="InterchangeList">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IListQuery, IinterchangeList } from './interchange_interface'
-import ButtonBox from './buttonBox.vue'
+import teminateDialog from '../components/terminateDialog.vue'
+import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   exportInterchangeList,
   getInterChangeList,
-  interchangeListBack,
-  interchangeListComplete,
-  interchangeListDelete,
-  interchangeListReturn,
-  interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
+  interchangeStatusChange,
 } from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import buttonBox from '@/components/buttonBox/buttonBox.vue'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
-
-// 是否加急
-const isUrgentMap = [
-  { label: '全部', value: '0' },
-  { label: '是', value: '1' },
-  { label: '否', value: '2' },
-]
-
-// 样品属性
-const sampleAttrMap = [
-  { label: '全部', value: '0' },
-  { label: '客户样品', value: '1' },
-  { label: '自有设备', value: '2' },
-]
-
-const currentMenu = ref('taking') // buttonBox菜单选中项
+const menu = ref<IMenu[]>([]) // 右上角菜单
+const currentMenu = ref('') // 选中的按钮
+const active = ref('') // 选中的按钮的code
+const terminateRef = ref() // 确认终止dialog
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
-  type: '',
+  sampleBelong: '', // 样品属性
+  sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
 // 表头待收入
 const columnsTaking = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
-
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '实际送达时间', value: 'deliverTime', align: 'center' },
+  { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
-  { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
 ])
 
@@ -94,66 +80,86 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
+const isUrgentMap = ref<dictType[]>([]) // 是否加急
+const sampleAttrMap = ref<dictType[]>([]) // 样品属性
+const sampleStatusMap = ref<dictType[]>([]) // 样品状态
+
+// 获取字典值
+async function getDict() {
+  // 是否加急
+  getDictByCode('isUrgent').then((response) => {
+    isUrgentMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value,
+      }
+    })
+    // 在已有的字典的基础上增加一个全部0进去
+    isUrgentMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2', // 是否加急全部后端定为2
+    })
+  })
+  // 样品属性
+  getDictByCode('sampleBelong').then((response) => {
+    sampleAttrMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value, // 后端需要int型，在此转换
+      }
+    })
+    // 在已有的字典的基础上增加一个全部进去
+    sampleAttrMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2',
+    })
+  })
+  // 样品状态
+  const res = await getDictByCode('sampleStatus')
+  sampleStatusMap.value = res.data.map((item: dictType) => {
+    return {
+      ...item,
+      value: parseInt(item.value as string), // 后端需要int型，在此转换
+    }
+  })
+  // 制作右上角的菜单
+  sampleStatusMap.value.forEach((item: dictType) => {
+    if (item.name === '待收入' || item.name === '待归还'
+      || item.name === '已归还' || item.name === '已超期') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+  menu.value.splice(1, 0, {
+    name: '已收入',
+    id: '2', // 后端规定已收入传2
+  })
+}
+
 // 数据查询
 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 || ''
-  listQuery.value.type = currentMenu.value
-  // getInterChangeList(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', // 预计送达时间
-  //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: 'test',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      orderCode: 'test', // 委托书编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      deliverer: 'test', // 送检人
-      isUrgent: '1', // 是否加急
-      sampleAttr: '1', // 样品属性
-      planDeliverTime: 'test', // 预计送达时间
-      deliverTime: 'test', // 实际送达时间
-      requireOverTime: 'test', // 要求检完时间
-      currentCertifications: '1', // 已出具证书总数
-      requireCertifications: '5', // 应出具证书总数
-      currentDeliver: 'test', // 当前检定环节
-    }].map((item: IinterchangeList) => {
-    return {
-      ...item,
-      Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
-    }
+  listQuery.value.sampleStatus = active.value
+  getInterChangeList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IinterchangeList) => {
+      return {
+        ...item,
+        Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
+        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
 }
 
@@ -166,17 +172,18 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    orderCode: '', // 委托书编号
+    orderNo: '', // 委托书编号
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    type: currentMenu.value,
+    sampleBelong: '', // 样品属性
+    sampleStatus: '',
     offset: 1,
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 多选发生改变时
@@ -195,11 +202,17 @@
   fetchData(true)
 }
 
-// 监听buttonBox切换
+// 按钮切换
 const changeCurrentButton = (val: string) => {
-  currentMenu.value = val
-  console.log(currentMenu.value)
-
+  active.value = val
+  const currentMenuItem = menu.value.find(item => item.id === val)
+  if (val === '2') {
+    currentMenu.value = '已收入'
+  }
+  else {
+    currentMenu.value = currentMenuItem!.name
+  }
+  window.sessionStorage.setItem('interchangeActive', val)
   fetchData(true)
 }
 
@@ -223,13 +236,13 @@
     const params = {
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
-      orderCode: listQuery.value.orderCode, // 委托书编号
+      orderNo: listQuery.value.orderNo, // 委托书编号
       customerId: listQuery.value.customerId, // 委托方代码
       startTime: listQuery.value.startTime, // 预计送达开始时间
       endTime: listQuery.value.endTime, // 预计送达结束时间
       isUrgent: listQuery.value.isUrgent, // 是否加急
-      sampleAttr: listQuery.value.sampleAttr, // 样品属性
-      type: currentMenu.value,
+      sampleBelong: listQuery.value.sampleBelong, // 样品属性
+      sampleStatus: active.value, // 样品状态
       ids: checkoutList.value,
     }
     exportInterchangeList(params).then((res) => {
@@ -256,15 +269,15 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'delete') { // 无需检测
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -272,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -280,7 +293,17 @@
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
+        let status
+        if (currentMenu.value === '已收入') {
+          status = '1'
+        }
+        if (currentMenu.value === '待归还') {
+          status = '2'
+        }
+        if (currentMenu.value === '已归还') {
+          status = '5'
+        }
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -288,15 +311,15 @@
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '6' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'urge') { // 催办 ------------------- 后端未开发完
+        interchangeListUrge({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -304,12 +327,7 @@
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success(`已${title}`)
-            fetchData(true)
-          }
-        })
+        terminateRef.value.initDialog(row)
       }
     })
 }
@@ -317,9 +335,9 @@
 // 打印列表
 function printList() {
   // 打印列
-  let column = columnsTaking.value
-  if (currentMenu.value === 'taking') {
-    column = columns.value
+  let column = columns.value
+  if (currentMenu.value === '待收入') {
+    column = columnsTaking.value
   }
   const properties = column.map((item) => {
     return {
@@ -341,10 +359,19 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
+  $router.push(`/sample/${pageType}/${row.sampleId}`)
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict() // 字典
+  if (window.sessionStorage.getItem('interchangeActive')) {
+    active.value = window.sessionStorage.getItem('interchangeActive')!
+  }
+  else {
+    active.value = '1' // 待收入
+  }
+  fetchData(true) // 列表数据
+})
 </script>
 
 <template>
@@ -371,7 +398,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.orderCode"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           class="short-input"
           clearable
@@ -403,17 +430,17 @@
           <el-option
             v-for="item in isUrgentMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
           <el-option
             v-for="item in sampleAttrMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
@@ -421,21 +448,21 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === 'taking'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === 'took' || currentMenu === 'overtime') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === 'returning'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
-        :data="list" :total="total" :columns="currentMenu === 'taking' ? columnsTaking : columns" :query="listQuery"
+        :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="240">
+          <el-table-column label="操作" align="center" fixed="right" width="270">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === '待收入'"
                 size="small"
                 type="primary"
                 link
@@ -452,7 +479,7 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === 'taking' || currentMenu === 'took' || currentMenu === 'returning')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === '待收入' || currentMenu === '已收入' || currentMenu === '待归还')"
                 size="small"
                 link
                 type="primary"
@@ -461,7 +488,7 @@
                 标签绑定
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="primary"
@@ -470,7 +497,7 @@
                 收入
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="danger"
@@ -479,7 +506,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
                 size="small"
                 link
                 type="primary"
@@ -488,7 +515,7 @@
                 完成
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === 'returning'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === '待归还'"
                 size="small"
                 link
                 type="primary"
@@ -497,7 +524,7 @@
                 归还
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === 'returning' || currentMenu === 'took' || currentMenu === 'returned')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === '待归还' || currentMenu === '已收入' || currentMenu === '已归还')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +533,7 @@
                 回退
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === 'overtime'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === '已超期'"
                 size="small"
                 link
                 type="primary"
@@ -515,7 +542,7 @@
                 催办
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/terminate') && (currentMenu === 'took' || currentMenu === 'overtime')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/terminate')"
                 size="small"
                 link
                 type="primary"
@@ -528,7 +555,9 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <!-- 终止弹窗 -->
+    <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts
index a7df4fd..e5140a4 100644
--- a/src/views/business/schedule/interchange/interchange_interface.ts
+++ b/src/views/business/schedule/interchange/interchange_interface.ts
@@ -3,13 +3,13 @@
 export interface IListQuery {
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
-  orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   customerId: string // 委托方代码
   startTime: string // 预计送达开始时间
   endTime: string // 预计送达结束时间
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
-  type: string // 类型（buttonBox）
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 样品状态
   offset: number
   limit: number
 }
@@ -20,23 +20,25 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   customerId: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送检人
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   planDeliverTime: string // 预计送达时间
   deliverTime: string // 实际送达时间
   requireOverTime: string // 要求检完时间
-  currentCertifications: string | number // 已出具证书总数
+  alreadyCertifications: string | number // 已出具证书总数
   requireCertifications: string | number // 应出具证书总数
   currentDeliver: string // 当前检定环节
+  orderId: string | number // 委托书id
+  sampleId: string | number// 样品id
 }
 
 // 检定记录
 export interface SimpleMeasureRecord {
-  orderCode: string // 委托单编号
+  orderNo: string // 委托单编号
   orderTime: string // 委托单日期
   customerCode: string // 委托人代码
   customerName: string // 委托人名称
@@ -93,3 +95,10 @@
   measureResult?: string // 检定结果
 }
 
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 2b57a17..ed11f7e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,23 +1,36 @@
-<script lang="ts" setup name="CustomerList">
+<script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import type { IReceiptDetail, dictType } from './receiptList-interface'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
+import selectOrder from './selectOrder.vue'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import selectSample from '@/views/business/schedule/order/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
-import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import BarCodeBind from '@/components/BarCodeBind/index.vue'
+import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
-const visible = ref(false) // 控制选择委托方对话框显隐
+const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const orderVisible = ref(false) // 控制委托书对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
-
-const ruleFormRef = ref()
+const minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
 // 表单
 const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -28,7 +41,7 @@
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方邮编
+  fax: '', // 委托方传真
   postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
   deliverer: '', // 送检人
@@ -41,9 +54,69 @@
   appearance: '', // 样品外观
   relyFile: '', // 依据文件
 })
+// 表单验证规则
+const rules = reactive<FormRules>({
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
+  certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
+  certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
+  certificationCompanyAddress: [{ required: true, message: '要求证书单位地址不能为空', trigger: 'blur' }],
+  reciever: [{ required: true, message: '要求接收人不能为空', trigger: 'blur' }],
+  recieverPhone: [{ required: true, message: '要求接收人电话/手机不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  fax: [{ required: true, message: '要求委托方传真不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  deliverer: [{ required: true, message: '要求送检人不能为空', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '要求送检人电话/手机不能为空', trigger: 'blur' }],
+  orderTime: [{ type: 'date', required: true, message: '要求委托日期不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', required: true, message: '要求完成时间不能为空', trigger: 'change' }],
+  deliverTime: [{ type: 'date', required: true, message: '要求交接时间不能为空', trigger: 'change' }],
+  measureCategory: [{ required: true, message: '要求校检类别不能为空', trigger: 'change' }],
+  secrecy: [{ required: true, message: '要求保密要求不能为空', trigger: 'change' }],
+})
+const list = ref<ISampleList[]>([])// 表格数据-样品
+// 选中的内容
+const checkoutList = ref([])
+// 表头
+const columns = ref([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号', value: 'sampleModel', align: 'center', required: true },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '外观', value: 'appearance', align: 'center' },
+  { text: '检定要求', value: 'measureRequire', align: 'center' },
+])
+
+// 签章查询数据
+const searchQuerySignature = reactive<queryType>({
+  signNo: 'qmqz202212050009', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '', // 1签名、2签章
+})
+// 签名查询数据
+const searchQueryAutograph = reactive<queryType>({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
 
 // 获取字典值
-function getDict() {
+async function getDict() {
   // 校检类别
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
@@ -77,8 +150,31 @@
   getDictByCode('secrecy').then((response) => {
     secrecyList.value = response.data
   })
+  // 获取类型（签名、签章）
+  const res = await getDictByCode('signType')
+  searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+  searchQueryAutograph.signType = res.data.filter((item: typeofSign) => item.name === '签名')[0].value
+  console.log(res.data.filter((item: typeofSign) => item.name === '签章')[0].value)
+  console.log(searchQuerySignature.signType)
+  console.log(searchQueryAutograph.signType)
 }
-getDict()
+
+// 获取签章数据
+const getSignatureList = () => {
+  listPageApi(searchQuerySignature).then((res) => {
+    if (res.code === 200) {
+      minioFileNameSignature.value = res.data.rows[0].minioFileName
+    }
+  })
+}
+// 获取签名数据
+const getAutographList = () => {
+  listPageApi(searchQueryAutograph).then((res) => {
+    if (res.code === 200) {
+      minioFileNameAutograph.value = res.data.rows[0].minioFileName
+    }
+  })
+}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
@@ -95,34 +191,148 @@
   $router.back()
 }
 
-// 选好委托方
-const confirmCheckout = (val: Array<ICustomer>) => {
-  // if (val && val.length) {
-  //   list.value = [] // 切换委托方时把样品清单置空
-  //   const getValue = val[0]
-  //   dataForm.value.customerNo = getValue.customerNo // 委托方代码
-  //   dataForm.value.customerId = getValue.id // 委托方id
-  //   dataForm.value.customerName = getValue.customerName // 委托方名称
-  //   dataForm.value.phone = getValue.phone // 委托方电话
-  //   dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
-  // }
-}
-
 // 点击提交
 const submit = () => {}
 
+// ------------------------委托书-----------------------------
 // 点击选择委托书编号
-const selectOrder = () => {
-
+const handleClickOrder = () => {
+  orderVisible.value = true
 }
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+  }
+}
+
+// ------------------------委托方-----------------------------
+// 点击选择委托方编号
+const handleClickCustomer = () => {
+  customerVisible.value = true
+}
+// 修改委托方对话框显隐
+const changeCustomerVisible = (val: boolean) => {
+  customerVisible.value = val
+}
+// 选好委托方
+const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    list.value = [] // 切换委托方时把样品清单置空
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
+    dataForm.value.fax = getValue.fax // 委托方传真
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// ------------------------样品-----------------------------
+// 点击批量增加
+const multiAdd = () => {
+  sampleVisible.value = true
+}
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: Array<ISampleList>) => {
+  if (val && val.length) {
+    val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+      if (index === -1) {
+        list.value.push({
+          ...item,
+        })
+      }
+    })
+  }
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index !== -1) {
+      list.value.splice(index, 1)
+    }
+  })
+}
+
+// 点击保存
+const saveForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (pageType.value === 'edit') { // 编辑
+          // updateOrder(params).then(() => {
+          //   ElMessage.success('已保存')
+          //   $router.go(-1)
+          // })
+        }
+        if (pageType.value === 'add') { // 新建
+          // addOrder(params).then(() => {
+          //   ElMessage.success('已保存')
+          //   $router.go(-1)
+          // })
+        }
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+// 接收人表单失去焦点--调用签名管理数据
+const receiverBlur = () => {
+  getAutographList()
+}
+
+onMounted(async () => {
+  if (pageType.value === 'add') {
+    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+  }
+  await getDict()
+  getSignatureList()
+})
 </script>
 
 <template>
   <app-container>
     <div id="main">
-      <div class="orderNo-title">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
         <span>交接单编号：</span>
-        <span>11111111</span>
+        <span>{{ dataForm.interchangeCode }}</span>
       </div>
       <div class="customer-title">
         <img src="@/assets/images/logo.png" class="img">
@@ -132,9 +342,6 @@
       </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="submit">
-            提交
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
           </el-button>
@@ -148,6 +355,7 @@
             :model="dataForm"
             :label-width="120"
             label-position="right"
+            :rules="rules"
           >
             <el-row :gutter="24">
               <el-col :span="6">
@@ -159,7 +367,7 @@
                     disabled
                   >
                     <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="selectOrder">
+                      <el-button size="small" @click="handleClickOrder">
                         选择
                       </el-button>
                     </template>
@@ -211,8 +419,6 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
                   <el-input
@@ -220,6 +426,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
+                    @blur="receiverBlur"
                   />
                 </el-form-item>
               </el-col>
@@ -234,6 +441,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
+
             <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="委托方代码:" prop="customerNo">
@@ -244,7 +452,7 @@
                     disabled
                   >
                     <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="selectCustomer">
+                      <el-button size="small" @click="handleClickCustomer">
                         选择
                       </el-button>
                     </template>
@@ -295,8 +503,6 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <el-input
@@ -317,6 +523,8 @@
                   />
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -327,7 +535,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
@@ -416,19 +624,19 @@
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="样品清单">
+      <detail-block title="被测样品列表">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            从样品库中添加
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-            增加行
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
             删除行
           </el-button>
         </template>
-        <!-- <el-table
+        <el-table
           :data="list"
           border
           style="width: 100%;"
@@ -445,33 +653,37 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
-                v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
-                :disabled="item.disabled"
-                class="input"
-              />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
-                <el-option
-                  v-for="i in powerVoltageMap"
-                  :key="i.value"
-                  :label="i.name"
-                  :value="i.value"
-                />
-              </el-select>
-              <span v-if="item.value === 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-            </template>
-          </el-table-column>
-        </el-table> -->
+          />
+        </el-table>
       </detail-block>
+      <!-- 签章部分 -->
+      <div class="receipt-signature">
+        <div class="content">
+          <span class="title">甲方</span>
+          <div class="deliverer-time">
+            <span class="text-title">送检人:</span>
+            <span class="time">时ㅤ间:</span>
+          </div>
+        </div>
+        <div class="content">
+          <span class="title">乙方</span>
 
+          <div class="deliverer-time">
+            <div class="img">
+              <show-photo height="111px" width="183px" :minio-file-name="minioFileNameSignature" />
+            </div>
+            <div class="img-name">
+              <show-photo height="100px" width="200px" :minio-file-name="minioFileNameAutograph" />
+            </div>
+
+            <span class="text-title">接收人:</span>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
       <!-- 公司信息 -->
       <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
@@ -485,13 +697,22 @@
       </div>
     </div>
     <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" /> -->
+    <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <!-- <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" /> -->
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 标签绑定 -->
+    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
+.orderNo-title {
+  font-size: 13px;
+  color: #606266;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
@@ -529,4 +750,58 @@
     }
   }
 }
+
+.receipt-signature {
+  display: flex;
+  justify-content: space-around;
+  // padding: 50px 250px 50px 150px;
+  padding: 50px;
+  font-size: 28px;
+  color: #000;
+  font-weight: 600;
+
+  .content {
+    display: flex;
+    position: relative;
+
+    .img {
+      position: absolute;
+      right: 0;
+      top: 0;
+      z-index: 2;
+    }
+
+    .img-name {
+      position: absolute;
+      left: 220px;
+      top: -30px;
+      z-index: 1;
+    }
+
+    .title {
+      margin-right: 32px;
+      letter-spacing: 6px;
+    }
+
+    .deliverer-time {
+      display: flex;
+      flex-direction: column;
+
+      .text-title {
+        letter-spacing: 2px;
+      }
+
+      .time {
+        margin-top: 30px;
+        letter-spacing: 2px;
+      }
+
+      .text {
+        font-size: 24px;
+        font-weight: 500;
+        margin-left: 10px;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index d9ed9d3..3decec5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -25,6 +25,7 @@
 
 // 详情表单
 export interface IReceiptDetail {
+  interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
@@ -49,6 +50,18 @@
   relyFile: string // 依据文件
 }
 
+// 样品清单
+export interface ISampleList {
+  id?: string
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  appendixDescn: string // 附件说明
+  appearance: string // 外观
+  measureRequire: string // 检定要求
+}
+
 // 字典
 export interface dictType {
   id: string

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 1c6231e..f80d0c5 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -86,7 +86,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" props="comments">
+          <el-form-item label="请输入退回原因" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
new file mode 100644
index 0000000..ef91bfd
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -0,0 +1,37 @@
+// 列表查询接口
+export interface IListQuery {
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  manufacturingNo: string	// 出厂编号
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  offset: number // 当前页
+  limit: number // 每页多少条
+}
+
+// 表格
+export interface IList {
+  id: string // 主键
+  originalRecordCode: string	// 原始记录单编号
+  originalRecordName: string // 原始记录名称
+  customerSampleInfo: { // 样品信息
+    sampleNo: string	// 样品编号
+    sampleName: string	// 样品名称
+    manufacturingNo: string	// 出厂编号
+    sampleModel: string // 样品型号
+  }
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  createTime: string // 创建时间
+  remark: string // 备注
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 48dd59c..98c4257 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -1,72 +1,78 @@
-<script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+<!-- 原始记录列表 -->
+<script lang="ts" setup name="PrimitiveLogList">
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import QrDialog from '@/components/QrDialog/index.vue'
+import type { IList, IListQuery, dictType } from './primitiveLogList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '', // 创建结束时间
-  createStartTime: '', // 创建开始时间
-  deptId: '', // 部门id
-  director: '', // 负责人
-  effectiveCompany: '', // 原始记录编号
-  ids: [], // 导出集合
-  trainEndTime: '', // 结束时间
-  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  trainStartTime: '', // 开始时间
-  testCategory: '', // 检测类别
+import { getDictByCode } from '@/api/system/dict'
+
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+// 查询条件
+const listQuery = ref<IListQuery>({
+  calibrationCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 多选选中
 const checkoutList = ref<string[]>([])
-const list = ref([]) // 数据列表
+const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
 
-const $router = useRouter()
+// 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = []
-  loadingTable.value = false
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name, // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
 }
-fetchData(true)
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
-const { proxy } = getCurrentInstance() as any
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
-  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
-  { text: '样品编号', value: 'text', align: 'center' },
-  { text: '样品名称', value: 'text', align: 'center' },
-  { text: '出厂编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '检校类别', value: 'text', align: 'center' },
-  { text: '创建人', value: 'text', align: 'center' },
-  { text: '创建时间', value: 'text', align: 'center' },
-  { text: '备注', value: 'text', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -75,53 +81,59 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '', // 创建结束时间
-    createStartTime: '', // 创建开始时间
-    deptId: '', // 部门id
-    director: '', // 负责人
-    effectiveCompany: '', // 原始记录编号
-    ids: [], // 导出集合
-    trainEndTime: '', // 结束时间
-    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    trainStartTime: '', // 开始时间
-    testCategory: '', // 检测类别
+    calibrationCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
-  trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      calibrationCategory: '',	// 校验类别
+      createUser: '',	// 创建人
+      manufacturingNo: '',	// 出厂编号
+      originalRecordCode: '',	// 原始记录单编号
+      sampleModel: '',	// 样品型号
+      sampleName: '',	// 样品名称
+      sampleNo: '',	// 样品编号
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    exportPrimitiveLogList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '原始记录列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  text: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IList, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/primitiveLogList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
-    `确认删除${row.text}吗？`,
+    `确认删除${row.originalRecordName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -130,28 +142,25 @@
     },
   )
     .then(() => {
-      // getListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      deletePrimitiveLogList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已删除')
+          fetchData(true)
+        }
+      })
     })
 }
 
-const handelClick = (text: string) => {}
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
+// 点击新建
 const add = () => {
   $router.push('/lab/primitiveLogList/add')
 }
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -162,6 +171,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -172,16 +182,21 @@
     }
   })
   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 => checkoutList.value.includes(item))
-    printJSON(printList, properties, '环境记录单列表')
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '原始记录单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
+})
 </script>
 
 <template>
@@ -189,57 +204,57 @@
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.effectiveCompany"
+          v-model.trim="listQuery.originalRecordCode"
           placeholder="原始记录编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.manufacturingNo"
           placeholder="出厂编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleModel"
           placeholder="型号"
           clearable
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.testCategory"
+          v-model="listQuery.calibrationCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
         >
           <el-option
-            v-for="item in testCategoryList"
-            :key="item.id"
+            v-for="item in mesureCategoryList"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"
+            :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.createUser"
           placeholder="创建人"
           clearable
         />
@@ -280,10 +295,10 @@
         @multiSelect="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/edit')"
                 size="small"
                 type="primary"
                 link
@@ -300,11 +315,11 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/delete')"
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c74b7dd..cd53837 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="EnvironmentalAdd">
+<script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -644,7 +644,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择检校时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -869,7 +869,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -883,7 +883,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
new file mode 100644
index 0000000..d5f85a0
--- /dev/null
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -0,0 +1,113 @@
+<!-- 终止操作 -->
+<script lang="ts" setup name="teminateDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import { interchangeListTerminate } from '../../../../api/business/schedule/interchangeList'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const formData = ref({
+  orderId: '', // 委托书id
+  reason: '', // 终止原因
+  sampleId: '', // 样品id
+  status: '5', // 样品状态
+})
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules = reactive<FormRules>({
+  reason: [{ required: true, message: '终止原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param orderId 委托书id
+ * @param sampleId 样品id
+ */
+function initDialog(row) {
+  // dataFormRef.value!.clearValidate()
+  formData.value.orderId = row.orderId
+  formData.value.sampleId = row.sampleId
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      // ElMessageBox.confirm(
+      //   '确认终止吗？',
+      //   '提示',
+      //   { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      // ).then(() => {
+      btnLoading.value = true
+      interchangeListTerminate(formData.value).then((res) => {
+        ElMessage.success('操作成功')
+        btnLoading.value = false
+        dialogVisible.value = false
+        emit('onSuccess')
+      }).catch((_) => {
+        btnLoading.value = false
+      })
+      // })
+    }
+  })
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="终止"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="请输入终止原因" prop="reason">
+            <el-input
+              v-model="formData.reason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm(dataFormRef)">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue
deleted file mode 100644
index dc864bd..0000000
--- a/src/views/business/schedule/interchange/buttonBox.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { DefaultProps } from 'element-plus'
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-// 按钮菜单
-const menu = [
-  { name: '待收入', id: 'taking' },
-  { name: '已收入', id: 'took' },
-  { name: '待归还', id: 'returning' },
-  { name: '已归还', id: 'returned' },
-  { name: '已超期', id: 'overtime' },
-]
-const current = ref('taking')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 76px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
deleted file mode 100644
index 27687fc..0000000
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ /dev/null
@@ -1,715 +0,0 @@
-<!-- 新建、编辑、详情 -->
-<script lang="ts" setup name="InterchangeEdit">
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ref } from 'vue'
-import { Search } from '@element-plus/icons-vue'
-import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
-import countries from '@/components/AddressSelect/country-code.json'
-import { UploadFile } from '@/api/measure/file'
-import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
-
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const pageType = ref('add') // 页面类型: add, edit, detail
-const countryList = ref(countries) // 国家列表
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
-const mesureCategoryMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const mesureCategoryList = [
-  {
-    label: '检定',
-    value: 'jd',
-  },
-  {
-    label: '检测',
-    value: 'jc',
-  },
-  {
-    label: '验收检定',
-    value: 'ysjd',
-  },
-  {
-    label: '抽检',
-    value: 'cj',
-  },
-  {
-    label: '校准',
-    value: 'jz',
-  },
-  {
-    label: '测试',
-    value: 'cs',
-  },
-  {
-    label: '验收校准',
-    value: 'ysjz',
-  },
-]// 校检类别
-const mesureResultList = [
-  {
-    label: '合格',
-    value: 'hg',
-  },
-  {
-    label: '修后合格',
-    value: 'xhhg',
-  },
-  {
-    label: '限用',
-    value: 'xy',
-  },
-  {
-    label: '准用',
-    value: 'zy',
-  },
-  {
-    label: '不合格',
-    value: 'bhg',
-  },
-  {
-    label: '漏检',
-    value: 'lj',
-  },
-  {
-    label: '逾期未检定',
-    value: 'yqwjd',
-  },
-]// 检定结果
-const mesureResultMap = {
-  hg: '合格',
-  xhhg: '修后合格',
-  xy: '限用',
-  zy: '准用',
-  bhg: '不合格',
-  lj: '漏检',
-  yqwjd: '逾期未检定',
-}// 检定结果字典
-const measureTypeList = [
-  {
-    label: '自检',
-    value: '1',
-  },
-  {
-    label: '外包',
-    value: '2',
-  },
-  {
-    label: '外检',
-    value: '3',
-  },
-]// 检定方式
-const dataForm: Ref<ISampleDetail> = ref({
-  id: '',
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 样品型号
-  manufacturingNo: '', // 出厂编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
-  manufacturer: '', // 生产厂家
-  manufacturerCountry: '', // 厂家国别
-  manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  // deliverer: '', // 送检人
-  // delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
-  remark: '', // 备注
-  minioFileName: '', // 说明书
-  labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-})
-const ruleFormRef = ref<FormInstance>()
-
-// 自定义校验规则--检定周期为正整数
-const validateMesurePeriod = (rule: any, value: any, callback: any) => {
-  if (value === '') {
-    callback()
-  }
-  else if (!(/(^[1-9]\d*$)/.test(value))) {
-    callback(new Error('请输入一个正整数'))
-  }
-  else {
-    callback()
-  }
-}
-
-// 校验规则
-const rules = reactive<FormRules>({
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
-  sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
-  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
-  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
-  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
-  postalCode: [{ required: true, message: '委托方邮编不能为空', trigger: 'blur' }],
-  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
-  mesureContent: [{ required: true, message: '检定项目不能为空', trigger: 'blur' }],
-  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-}) // 表单验证规则
-
-// 其他关联数据列表
-const dataList = ref({
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
-})
-
-// 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
-}
-// 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
-}
-
-// 菜单
-const menu: Menu[] = [
-  {
-    name: '检定记录',
-    columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
-    ],
-    list: 'measureRecords',
-    pagination: true,
-    searchFunc: fetchMeasureRecords,
-  },
-  {
-    name: '检定证书',
-    columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
-    ],
-    list: 'certificationRecords',
-    pagination: true,
-    searchFunc: fetchCertifications,
-  },
-]
-
-const currentMenu = ref('检定记录')
-const currentMenuObj = computed(() => {
-  return menu.find(item => item.name === currentMenu.value)
-})
-
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-
-// 打印表单
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '样品详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        dataForm.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-
-// 委托方代码获取焦点
-const customerNoFocus = () => {
-  visible.value = true
-}
-
-// 选好委托方
-const confirmCheckout = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.companyAddress = getValue.briefName
-  }
-}
-
-// 控制选择委托方对话框显隐
-const changeVisible = (val: boolean) => {
-  visible.value = val
-}
-
-// 保存
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        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)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取详情
-const getInfo = () => {
-  getSapmleDetail({ id: infoId.value }).then((res) => {
-    res.data = {
-      ABC: 'A',
-      companyAddress: '北京/北京市',
-      customerName: '京东集团',
-      customerNo: 'sygf202211290001',
-      id: '',
-      labelBind: '11222',
-      manufacturer: '北京某厂家',
-      manufacturerCountry: 'CN',
-      manufacturingDate: '2023-03',
-      manufacturingNo: '123121',
-      mesureCategory: 'jd',
-      mesureContent: '项目1',
-      mesurePeriod: '1',
-      mesureType: 'zj',
-      minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-      phone: '950618',
-      postalCode: 'test',
-      remark: '无备注',
-      sampleModel: '型号1',
-      sampleName: '样品1',
-      sampleNo: '',
-      measureResultCode: 'bhg',
-    }
-    // dataForm.value = res.data
-    // dataForm.value.measureResult = mesureResultMap[dataForm.value.measureResultCode]
-    // for (const item of menu) {
-    //   item.searchFunc()
-    // }
-  })
-}
-
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`样品-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <div id="form">
-        <el-form
-          ref="ruleFormRef"
-          :model="dataForm"
-          :label-width="120"
-          label-position="right"
-          :rules="rules"
-        >
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="样品编号:" prop="sampleNo">
-                <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="样品名称:" prop="sampleName">
-                <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col><el-col :span="6">
-              <el-form-item label="样品型号:" prop="sampleModel">
-                <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂编号:" prop="manufacturingNo">
-                <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方代码" prop="customerNo">
-                <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @focus="customerNoFocus"
-                >
-                  <template #suffix>
-                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
-                      <search />
-                    </el-icon>
-                  </template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方名称" prop="customerName">
-                <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话" prop="phone">
-                <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方邮编" prop="postalCode">
-                <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="18">
-              <el-form-item label="委托方地址:" prop="companyAddress">
-                <el-input
-                  v-model="dataForm.companyAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="校检类别:">
-                <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="生产厂家:">
-                <el-input
-                  v-model="dataForm.manufacturer"
-                  :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.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂年月:">
-                <el-date-picker
-                  v-model="dataForm.manufacturingDate"
-                  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="ABC:">
-                <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="检定周期（月）:" prop="mesurePeriod">
-                <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="送检人:">
-                <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="联系方式:">
-                <el-input
-                  v-model="dataForm.delivererTel"
-                  :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"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标签绑定:">
-                <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="检定项目:" prop="mesureContent">
-                <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="备注:">
-                <el-input
-                  v-model="dataForm.remark"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </detail-page>
-
-    <!-- 检定记录、检定证书 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
-      <template #menu>
-        <el-radio-group v-model="currentMenu">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </template>
-      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
-    </detail-block-switch>
-
-    <!-- 选择委托方组件 -->
-    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 6e5c9b9..6b3eb34 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -1,88 +1,74 @@
+<!-- 设备收发列表 -->
 <script lang="ts" setup name="InterchangeList">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IListQuery, IinterchangeList } from './interchange_interface'
-import ButtonBox from './buttonBox.vue'
+import teminateDialog from '../components/terminateDialog.vue'
+import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   exportInterchangeList,
   getInterChangeList,
-  interchangeListBack,
-  interchangeListComplete,
-  interchangeListDelete,
-  interchangeListReturn,
-  interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
+  interchangeStatusChange,
 } from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import buttonBox from '@/components/buttonBox/buttonBox.vue'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
-
-// 是否加急
-const isUrgentMap = [
-  { label: '全部', value: '0' },
-  { label: '是', value: '1' },
-  { label: '否', value: '2' },
-]
-
-// 样品属性
-const sampleAttrMap = [
-  { label: '全部', value: '0' },
-  { label: '客户样品', value: '1' },
-  { label: '自有设备', value: '2' },
-]
-
-const currentMenu = ref('taking') // buttonBox菜单选中项
+const menu = ref<IMenu[]>([]) // 右上角菜单
+const currentMenu = ref('') // 选中的按钮
+const active = ref('') // 选中的按钮的code
+const terminateRef = ref() // 确认终止dialog
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
-  type: '',
+  sampleBelong: '', // 样品属性
+  sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
 // 表头待收入
 const columnsTaking = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
-
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '实际送达时间', value: 'deliverTime', align: 'center' },
+  { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
-  { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
 ])
 
@@ -94,66 +80,86 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
+const isUrgentMap = ref<dictType[]>([]) // 是否加急
+const sampleAttrMap = ref<dictType[]>([]) // 样品属性
+const sampleStatusMap = ref<dictType[]>([]) // 样品状态
+
+// 获取字典值
+async function getDict() {
+  // 是否加急
+  getDictByCode('isUrgent').then((response) => {
+    isUrgentMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value,
+      }
+    })
+    // 在已有的字典的基础上增加一个全部0进去
+    isUrgentMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2', // 是否加急全部后端定为2
+    })
+  })
+  // 样品属性
+  getDictByCode('sampleBelong').then((response) => {
+    sampleAttrMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value, // 后端需要int型，在此转换
+      }
+    })
+    // 在已有的字典的基础上增加一个全部进去
+    sampleAttrMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2',
+    })
+  })
+  // 样品状态
+  const res = await getDictByCode('sampleStatus')
+  sampleStatusMap.value = res.data.map((item: dictType) => {
+    return {
+      ...item,
+      value: parseInt(item.value as string), // 后端需要int型，在此转换
+    }
+  })
+  // 制作右上角的菜单
+  sampleStatusMap.value.forEach((item: dictType) => {
+    if (item.name === '待收入' || item.name === '待归还'
+      || item.name === '已归还' || item.name === '已超期') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+  menu.value.splice(1, 0, {
+    name: '已收入',
+    id: '2', // 后端规定已收入传2
+  })
+}
+
 // 数据查询
 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 || ''
-  listQuery.value.type = currentMenu.value
-  // getInterChangeList(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', // 预计送达时间
-  //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: 'test',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      orderCode: 'test', // 委托书编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      deliverer: 'test', // 送检人
-      isUrgent: '1', // 是否加急
-      sampleAttr: '1', // 样品属性
-      planDeliverTime: 'test', // 预计送达时间
-      deliverTime: 'test', // 实际送达时间
-      requireOverTime: 'test', // 要求检完时间
-      currentCertifications: '1', // 已出具证书总数
-      requireCertifications: '5', // 应出具证书总数
-      currentDeliver: 'test', // 当前检定环节
-    }].map((item: IinterchangeList) => {
-    return {
-      ...item,
-      Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
-    }
+  listQuery.value.sampleStatus = active.value
+  getInterChangeList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IinterchangeList) => {
+      return {
+        ...item,
+        Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
+        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
 }
 
@@ -166,17 +172,18 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    orderCode: '', // 委托书编号
+    orderNo: '', // 委托书编号
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    type: currentMenu.value,
+    sampleBelong: '', // 样品属性
+    sampleStatus: '',
     offset: 1,
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 多选发生改变时
@@ -195,11 +202,17 @@
   fetchData(true)
 }
 
-// 监听buttonBox切换
+// 按钮切换
 const changeCurrentButton = (val: string) => {
-  currentMenu.value = val
-  console.log(currentMenu.value)
-
+  active.value = val
+  const currentMenuItem = menu.value.find(item => item.id === val)
+  if (val === '2') {
+    currentMenu.value = '已收入'
+  }
+  else {
+    currentMenu.value = currentMenuItem!.name
+  }
+  window.sessionStorage.setItem('interchangeActive', val)
   fetchData(true)
 }
 
@@ -223,13 +236,13 @@
     const params = {
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
-      orderCode: listQuery.value.orderCode, // 委托书编号
+      orderNo: listQuery.value.orderNo, // 委托书编号
       customerId: listQuery.value.customerId, // 委托方代码
       startTime: listQuery.value.startTime, // 预计送达开始时间
       endTime: listQuery.value.endTime, // 预计送达结束时间
       isUrgent: listQuery.value.isUrgent, // 是否加急
-      sampleAttr: listQuery.value.sampleAttr, // 样品属性
-      type: currentMenu.value,
+      sampleBelong: listQuery.value.sampleBelong, // 样品属性
+      sampleStatus: active.value, // 样品状态
       ids: checkoutList.value,
     }
     exportInterchangeList(params).then((res) => {
@@ -256,15 +269,15 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'delete') { // 无需检测
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -272,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -280,7 +293,17 @@
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
+        let status
+        if (currentMenu.value === '已收入') {
+          status = '1'
+        }
+        if (currentMenu.value === '待归还') {
+          status = '2'
+        }
+        if (currentMenu.value === '已归还') {
+          status = '5'
+        }
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -288,15 +311,15 @@
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '6' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'urge') { // 催办 ------------------- 后端未开发完
+        interchangeListUrge({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -304,12 +327,7 @@
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success(`已${title}`)
-            fetchData(true)
-          }
-        })
+        terminateRef.value.initDialog(row)
       }
     })
 }
@@ -317,9 +335,9 @@
 // 打印列表
 function printList() {
   // 打印列
-  let column = columnsTaking.value
-  if (currentMenu.value === 'taking') {
-    column = columns.value
+  let column = columns.value
+  if (currentMenu.value === '待收入') {
+    column = columnsTaking.value
   }
   const properties = column.map((item) => {
     return {
@@ -341,10 +359,19 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
+  $router.push(`/sample/${pageType}/${row.sampleId}`)
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict() // 字典
+  if (window.sessionStorage.getItem('interchangeActive')) {
+    active.value = window.sessionStorage.getItem('interchangeActive')!
+  }
+  else {
+    active.value = '1' // 待收入
+  }
+  fetchData(true) // 列表数据
+})
 </script>
 
 <template>
@@ -371,7 +398,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.orderCode"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           class="short-input"
           clearable
@@ -403,17 +430,17 @@
           <el-option
             v-for="item in isUrgentMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
           <el-option
             v-for="item in sampleAttrMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
@@ -421,21 +448,21 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === 'taking'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === 'took' || currentMenu === 'overtime') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === 'returning'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
-        :data="list" :total="total" :columns="currentMenu === 'taking' ? columnsTaking : columns" :query="listQuery"
+        :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="240">
+          <el-table-column label="操作" align="center" fixed="right" width="270">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === '待收入'"
                 size="small"
                 type="primary"
                 link
@@ -452,7 +479,7 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === 'taking' || currentMenu === 'took' || currentMenu === 'returning')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === '待收入' || currentMenu === '已收入' || currentMenu === '待归还')"
                 size="small"
                 link
                 type="primary"
@@ -461,7 +488,7 @@
                 标签绑定
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="primary"
@@ -470,7 +497,7 @@
                 收入
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="danger"
@@ -479,7 +506,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
                 size="small"
                 link
                 type="primary"
@@ -488,7 +515,7 @@
                 完成
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === 'returning'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === '待归还'"
                 size="small"
                 link
                 type="primary"
@@ -497,7 +524,7 @@
                 归还
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === 'returning' || currentMenu === 'took' || currentMenu === 'returned')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === '待归还' || currentMenu === '已收入' || currentMenu === '已归还')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +533,7 @@
                 回退
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === 'overtime'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === '已超期'"
                 size="small"
                 link
                 type="primary"
@@ -515,7 +542,7 @@
                 催办
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/terminate') && (currentMenu === 'took' || currentMenu === 'overtime')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/terminate')"
                 size="small"
                 link
                 type="primary"
@@ -528,7 +555,9 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <!-- 终止弹窗 -->
+    <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts
index a7df4fd..e5140a4 100644
--- a/src/views/business/schedule/interchange/interchange_interface.ts
+++ b/src/views/business/schedule/interchange/interchange_interface.ts
@@ -3,13 +3,13 @@
 export interface IListQuery {
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
-  orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   customerId: string // 委托方代码
   startTime: string // 预计送达开始时间
   endTime: string // 预计送达结束时间
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
-  type: string // 类型（buttonBox）
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 样品状态
   offset: number
   limit: number
 }
@@ -20,23 +20,25 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   customerId: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送检人
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   planDeliverTime: string // 预计送达时间
   deliverTime: string // 实际送达时间
   requireOverTime: string // 要求检完时间
-  currentCertifications: string | number // 已出具证书总数
+  alreadyCertifications: string | number // 已出具证书总数
   requireCertifications: string | number // 应出具证书总数
   currentDeliver: string // 当前检定环节
+  orderId: string | number // 委托书id
+  sampleId: string | number// 样品id
 }
 
 // 检定记录
 export interface SimpleMeasureRecord {
-  orderCode: string // 委托单编号
+  orderNo: string // 委托单编号
   orderTime: string // 委托单日期
   customerCode: string // 委托人代码
   customerName: string // 委托人名称
@@ -93,3 +95,10 @@
   measureResult?: string // 检定结果
 }
 
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 2b57a17..ed11f7e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,23 +1,36 @@
-<script lang="ts" setup name="CustomerList">
+<script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import type { IReceiptDetail, dictType } from './receiptList-interface'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
+import selectOrder from './selectOrder.vue'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import selectSample from '@/views/business/schedule/order/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
-import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import BarCodeBind from '@/components/BarCodeBind/index.vue'
+import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
-const visible = ref(false) // 控制选择委托方对话框显隐
+const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const orderVisible = ref(false) // 控制委托书对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
-
-const ruleFormRef = ref()
+const minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
 // 表单
 const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -28,7 +41,7 @@
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方邮编
+  fax: '', // 委托方传真
   postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
   deliverer: '', // 送检人
@@ -41,9 +54,69 @@
   appearance: '', // 样品外观
   relyFile: '', // 依据文件
 })
+// 表单验证规则
+const rules = reactive<FormRules>({
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
+  certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
+  certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
+  certificationCompanyAddress: [{ required: true, message: '要求证书单位地址不能为空', trigger: 'blur' }],
+  reciever: [{ required: true, message: '要求接收人不能为空', trigger: 'blur' }],
+  recieverPhone: [{ required: true, message: '要求接收人电话/手机不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  fax: [{ required: true, message: '要求委托方传真不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  deliverer: [{ required: true, message: '要求送检人不能为空', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '要求送检人电话/手机不能为空', trigger: 'blur' }],
+  orderTime: [{ type: 'date', required: true, message: '要求委托日期不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', required: true, message: '要求完成时间不能为空', trigger: 'change' }],
+  deliverTime: [{ type: 'date', required: true, message: '要求交接时间不能为空', trigger: 'change' }],
+  measureCategory: [{ required: true, message: '要求校检类别不能为空', trigger: 'change' }],
+  secrecy: [{ required: true, message: '要求保密要求不能为空', trigger: 'change' }],
+})
+const list = ref<ISampleList[]>([])// 表格数据-样品
+// 选中的内容
+const checkoutList = ref([])
+// 表头
+const columns = ref([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号', value: 'sampleModel', align: 'center', required: true },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '外观', value: 'appearance', align: 'center' },
+  { text: '检定要求', value: 'measureRequire', align: 'center' },
+])
+
+// 签章查询数据
+const searchQuerySignature = reactive<queryType>({
+  signNo: 'qmqz202212050009', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '', // 1签名、2签章
+})
+// 签名查询数据
+const searchQueryAutograph = reactive<queryType>({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
 
 // 获取字典值
-function getDict() {
+async function getDict() {
   // 校检类别
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
@@ -77,8 +150,31 @@
   getDictByCode('secrecy').then((response) => {
     secrecyList.value = response.data
   })
+  // 获取类型（签名、签章）
+  const res = await getDictByCode('signType')
+  searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+  searchQueryAutograph.signType = res.data.filter((item: typeofSign) => item.name === '签名')[0].value
+  console.log(res.data.filter((item: typeofSign) => item.name === '签章')[0].value)
+  console.log(searchQuerySignature.signType)
+  console.log(searchQueryAutograph.signType)
 }
-getDict()
+
+// 获取签章数据
+const getSignatureList = () => {
+  listPageApi(searchQuerySignature).then((res) => {
+    if (res.code === 200) {
+      minioFileNameSignature.value = res.data.rows[0].minioFileName
+    }
+  })
+}
+// 获取签名数据
+const getAutographList = () => {
+  listPageApi(searchQueryAutograph).then((res) => {
+    if (res.code === 200) {
+      minioFileNameAutograph.value = res.data.rows[0].minioFileName
+    }
+  })
+}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
@@ -95,34 +191,148 @@
   $router.back()
 }
 
-// 选好委托方
-const confirmCheckout = (val: Array<ICustomer>) => {
-  // if (val && val.length) {
-  //   list.value = [] // 切换委托方时把样品清单置空
-  //   const getValue = val[0]
-  //   dataForm.value.customerNo = getValue.customerNo // 委托方代码
-  //   dataForm.value.customerId = getValue.id // 委托方id
-  //   dataForm.value.customerName = getValue.customerName // 委托方名称
-  //   dataForm.value.phone = getValue.phone // 委托方电话
-  //   dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
-  // }
-}
-
 // 点击提交
 const submit = () => {}
 
+// ------------------------委托书-----------------------------
 // 点击选择委托书编号
-const selectOrder = () => {
-
+const handleClickOrder = () => {
+  orderVisible.value = true
 }
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+  }
+}
+
+// ------------------------委托方-----------------------------
+// 点击选择委托方编号
+const handleClickCustomer = () => {
+  customerVisible.value = true
+}
+// 修改委托方对话框显隐
+const changeCustomerVisible = (val: boolean) => {
+  customerVisible.value = val
+}
+// 选好委托方
+const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    list.value = [] // 切换委托方时把样品清单置空
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
+    dataForm.value.fax = getValue.fax // 委托方传真
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// ------------------------样品-----------------------------
+// 点击批量增加
+const multiAdd = () => {
+  sampleVisible.value = true
+}
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: Array<ISampleList>) => {
+  if (val && val.length) {
+    val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+      if (index === -1) {
+        list.value.push({
+          ...item,
+        })
+      }
+    })
+  }
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index !== -1) {
+      list.value.splice(index, 1)
+    }
+  })
+}
+
+// 点击保存
+const saveForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (pageType.value === 'edit') { // 编辑
+          // updateOrder(params).then(() => {
+          //   ElMessage.success('已保存')
+          //   $router.go(-1)
+          // })
+        }
+        if (pageType.value === 'add') { // 新建
+          // addOrder(params).then(() => {
+          //   ElMessage.success('已保存')
+          //   $router.go(-1)
+          // })
+        }
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+// 接收人表单失去焦点--调用签名管理数据
+const receiverBlur = () => {
+  getAutographList()
+}
+
+onMounted(async () => {
+  if (pageType.value === 'add') {
+    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+  }
+  await getDict()
+  getSignatureList()
+})
 </script>
 
 <template>
   <app-container>
     <div id="main">
-      <div class="orderNo-title">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
         <span>交接单编号：</span>
-        <span>11111111</span>
+        <span>{{ dataForm.interchangeCode }}</span>
       </div>
       <div class="customer-title">
         <img src="@/assets/images/logo.png" class="img">
@@ -132,9 +342,6 @@
       </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="submit">
-            提交
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
           </el-button>
@@ -148,6 +355,7 @@
             :model="dataForm"
             :label-width="120"
             label-position="right"
+            :rules="rules"
           >
             <el-row :gutter="24">
               <el-col :span="6">
@@ -159,7 +367,7 @@
                     disabled
                   >
                     <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="selectOrder">
+                      <el-button size="small" @click="handleClickOrder">
                         选择
                       </el-button>
                     </template>
@@ -211,8 +419,6 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
                   <el-input
@@ -220,6 +426,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
+                    @blur="receiverBlur"
                   />
                 </el-form-item>
               </el-col>
@@ -234,6 +441,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
+
             <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="委托方代码:" prop="customerNo">
@@ -244,7 +452,7 @@
                     disabled
                   >
                     <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="selectCustomer">
+                      <el-button size="small" @click="handleClickCustomer">
                         选择
                       </el-button>
                     </template>
@@ -295,8 +503,6 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <el-input
@@ -317,6 +523,8 @@
                   />
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -327,7 +535,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
@@ -416,19 +624,19 @@
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="样品清单">
+      <detail-block title="被测样品列表">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            从样品库中添加
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-            增加行
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
             删除行
           </el-button>
         </template>
-        <!-- <el-table
+        <el-table
           :data="list"
           border
           style="width: 100%;"
@@ -445,33 +653,37 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
-                v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
-                :disabled="item.disabled"
-                class="input"
-              />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
-                <el-option
-                  v-for="i in powerVoltageMap"
-                  :key="i.value"
-                  :label="i.name"
-                  :value="i.value"
-                />
-              </el-select>
-              <span v-if="item.value === 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-            </template>
-          </el-table-column>
-        </el-table> -->
+          />
+        </el-table>
       </detail-block>
+      <!-- 签章部分 -->
+      <div class="receipt-signature">
+        <div class="content">
+          <span class="title">甲方</span>
+          <div class="deliverer-time">
+            <span class="text-title">送检人:</span>
+            <span class="time">时ㅤ间:</span>
+          </div>
+        </div>
+        <div class="content">
+          <span class="title">乙方</span>
 
+          <div class="deliverer-time">
+            <div class="img">
+              <show-photo height="111px" width="183px" :minio-file-name="minioFileNameSignature" />
+            </div>
+            <div class="img-name">
+              <show-photo height="100px" width="200px" :minio-file-name="minioFileNameAutograph" />
+            </div>
+
+            <span class="text-title">接收人:</span>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
       <!-- 公司信息 -->
       <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
@@ -485,13 +697,22 @@
       </div>
     </div>
     <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" /> -->
+    <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <!-- <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" /> -->
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 标签绑定 -->
+    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
+.orderNo-title {
+  font-size: 13px;
+  color: #606266;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
@@ -529,4 +750,58 @@
     }
   }
 }
+
+.receipt-signature {
+  display: flex;
+  justify-content: space-around;
+  // padding: 50px 250px 50px 150px;
+  padding: 50px;
+  font-size: 28px;
+  color: #000;
+  font-weight: 600;
+
+  .content {
+    display: flex;
+    position: relative;
+
+    .img {
+      position: absolute;
+      right: 0;
+      top: 0;
+      z-index: 2;
+    }
+
+    .img-name {
+      position: absolute;
+      left: 220px;
+      top: -30px;
+      z-index: 1;
+    }
+
+    .title {
+      margin-right: 32px;
+      letter-spacing: 6px;
+    }
+
+    .deliverer-time {
+      display: flex;
+      flex-direction: column;
+
+      .text-title {
+        letter-spacing: 2px;
+      }
+
+      .time {
+        margin-top: 30px;
+        letter-spacing: 2px;
+      }
+
+      .text {
+        font-size: 24px;
+        font-weight: 500;
+        margin-left: 10px;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index d9ed9d3..3decec5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -25,6 +25,7 @@
 
 // 详情表单
 export interface IReceiptDetail {
+  interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
@@ -49,6 +50,18 @@
   relyFile: string // 依据文件
 }
 
+// 样品清单
+export interface ISampleList {
+  id?: string
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  appendixDescn: string // 附件说明
+  appearance: string // 外观
+  measureRequire: string // 检定要求
+}
+
 // 字典
 export interface dictType {
   id: string
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index feb3507..03f3492 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="CustomerList">
+<!-- 设备交接单列表 -->
+<script lang="ts" setup name="ReceiptList">
 import type { DateModelType } from 'element-plus'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
@@ -6,6 +7,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -23,12 +25,12 @@
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center' },
+  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '接收人', value: 'reciever', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center' },
+  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
@@ -43,30 +45,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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1111',
-      interchangeCode: '1111', // 交接单编号
-      customerNo: '1111', // 委托方代码
-      customerName: '1111', // 委托方名称
-      reciever: '1111', // 接收人
-      deliverer: '1111', // 送样人
-      deliverTime: '1111', // 交接时间
-      remark: '1111', // 备注
-    },
-  ]
+  getReceiptList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 点击编辑/详情
@@ -81,13 +71,17 @@
 
 // 点击取消
 const handleCancle = (id: string) => {
-
+  deleteReceiptList({ id }).then(() => {
+    ElMessage.success('已取消')
+    fetchData(true)
+  })
 }
 
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -130,18 +124,21 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
+      interchangeCode: '', // 交接单编号
       customerNo: '', // 委托方代码
       customerName: '', // 委托方名称
+      reciever: '', // 接收人
       deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      startTime: '', // 交接开始时间
+      endTime: '', // 交接结束时间
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
-    // exportReceiptListList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '委托书列表.xlsx')
-    // })
+    exportReceiptList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备交接单列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 1c6231e..f80d0c5 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -86,7 +86,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" props="comments">
+          <el-form-item label="请输入退回原因" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
new file mode 100644
index 0000000..ef91bfd
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -0,0 +1,37 @@
+// 列表查询接口
+export interface IListQuery {
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  manufacturingNo: string	// 出厂编号
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  offset: number // 当前页
+  limit: number // 每页多少条
+}
+
+// 表格
+export interface IList {
+  id: string // 主键
+  originalRecordCode: string	// 原始记录单编号
+  originalRecordName: string // 原始记录名称
+  customerSampleInfo: { // 样品信息
+    sampleNo: string	// 样品编号
+    sampleName: string	// 样品名称
+    manufacturingNo: string	// 出厂编号
+    sampleModel: string // 样品型号
+  }
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  createTime: string // 创建时间
+  remark: string // 备注
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 48dd59c..98c4257 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -1,72 +1,78 @@
-<script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+<!-- 原始记录列表 -->
+<script lang="ts" setup name="PrimitiveLogList">
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import QrDialog from '@/components/QrDialog/index.vue'
+import type { IList, IListQuery, dictType } from './primitiveLogList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '', // 创建结束时间
-  createStartTime: '', // 创建开始时间
-  deptId: '', // 部门id
-  director: '', // 负责人
-  effectiveCompany: '', // 原始记录编号
-  ids: [], // 导出集合
-  trainEndTime: '', // 结束时间
-  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  trainStartTime: '', // 开始时间
-  testCategory: '', // 检测类别
+import { getDictByCode } from '@/api/system/dict'
+
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+// 查询条件
+const listQuery = ref<IListQuery>({
+  calibrationCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 多选选中
 const checkoutList = ref<string[]>([])
-const list = ref([]) // 数据列表
+const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
 
-const $router = useRouter()
+// 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = []
-  loadingTable.value = false
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name, // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
 }
-fetchData(true)
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
-const { proxy } = getCurrentInstance() as any
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
-  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
-  { text: '样品编号', value: 'text', align: 'center' },
-  { text: '样品名称', value: 'text', align: 'center' },
-  { text: '出厂编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '检校类别', value: 'text', align: 'center' },
-  { text: '创建人', value: 'text', align: 'center' },
-  { text: '创建时间', value: 'text', align: 'center' },
-  { text: '备注', value: 'text', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -75,53 +81,59 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '', // 创建结束时间
-    createStartTime: '', // 创建开始时间
-    deptId: '', // 部门id
-    director: '', // 负责人
-    effectiveCompany: '', // 原始记录编号
-    ids: [], // 导出集合
-    trainEndTime: '', // 结束时间
-    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    trainStartTime: '', // 开始时间
-    testCategory: '', // 检测类别
+    calibrationCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
-  trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      calibrationCategory: '',	// 校验类别
+      createUser: '',	// 创建人
+      manufacturingNo: '',	// 出厂编号
+      originalRecordCode: '',	// 原始记录单编号
+      sampleModel: '',	// 样品型号
+      sampleName: '',	// 样品名称
+      sampleNo: '',	// 样品编号
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    exportPrimitiveLogList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '原始记录列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  text: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IList, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/primitiveLogList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
-    `确认删除${row.text}吗？`,
+    `确认删除${row.originalRecordName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -130,28 +142,25 @@
     },
   )
     .then(() => {
-      // getListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      deletePrimitiveLogList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已删除')
+          fetchData(true)
+        }
+      })
     })
 }
 
-const handelClick = (text: string) => {}
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
+// 点击新建
 const add = () => {
   $router.push('/lab/primitiveLogList/add')
 }
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -162,6 +171,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -172,16 +182,21 @@
     }
   })
   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 => checkoutList.value.includes(item))
-    printJSON(printList, properties, '环境记录单列表')
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '原始记录单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
+})
 </script>
 
 <template>
@@ -189,57 +204,57 @@
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.effectiveCompany"
+          v-model.trim="listQuery.originalRecordCode"
           placeholder="原始记录编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.manufacturingNo"
           placeholder="出厂编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleModel"
           placeholder="型号"
           clearable
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.testCategory"
+          v-model="listQuery.calibrationCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
         >
           <el-option
-            v-for="item in testCategoryList"
-            :key="item.id"
+            v-for="item in mesureCategoryList"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"
+            :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.createUser"
           placeholder="创建人"
           clearable
         />
@@ -280,10 +295,10 @@
         @multiSelect="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/edit')"
                 size="small"
                 type="primary"
                 link
@@ -300,11 +315,11 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/delete')"
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c74b7dd..cd53837 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="EnvironmentalAdd">
+<script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -644,7 +644,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择检校时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -869,7 +869,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -883,7 +883,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
new file mode 100644
index 0000000..d5f85a0
--- /dev/null
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -0,0 +1,113 @@
+<!-- 终止操作 -->
+<script lang="ts" setup name="teminateDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import { interchangeListTerminate } from '../../../../api/business/schedule/interchangeList'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const formData = ref({
+  orderId: '', // 委托书id
+  reason: '', // 终止原因
+  sampleId: '', // 样品id
+  status: '5', // 样品状态
+})
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules = reactive<FormRules>({
+  reason: [{ required: true, message: '终止原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param orderId 委托书id
+ * @param sampleId 样品id
+ */
+function initDialog(row) {
+  // dataFormRef.value!.clearValidate()
+  formData.value.orderId = row.orderId
+  formData.value.sampleId = row.sampleId
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      // ElMessageBox.confirm(
+      //   '确认终止吗？',
+      //   '提示',
+      //   { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      // ).then(() => {
+      btnLoading.value = true
+      interchangeListTerminate(formData.value).then((res) => {
+        ElMessage.success('操作成功')
+        btnLoading.value = false
+        dialogVisible.value = false
+        emit('onSuccess')
+      }).catch((_) => {
+        btnLoading.value = false
+      })
+      // })
+    }
+  })
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="终止"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="请输入终止原因" prop="reason">
+            <el-input
+              v-model="formData.reason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm(dataFormRef)">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue
deleted file mode 100644
index dc864bd..0000000
--- a/src/views/business/schedule/interchange/buttonBox.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { DefaultProps } from 'element-plus'
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-// 按钮菜单
-const menu = [
-  { name: '待收入', id: 'taking' },
-  { name: '已收入', id: 'took' },
-  { name: '待归还', id: 'returning' },
-  { name: '已归还', id: 'returned' },
-  { name: '已超期', id: 'overtime' },
-]
-const current = ref('taking')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 76px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
deleted file mode 100644
index 27687fc..0000000
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ /dev/null
@@ -1,715 +0,0 @@
-<!-- 新建、编辑、详情 -->
-<script lang="ts" setup name="InterchangeEdit">
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ref } from 'vue'
-import { Search } from '@element-plus/icons-vue'
-import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
-import countries from '@/components/AddressSelect/country-code.json'
-import { UploadFile } from '@/api/measure/file'
-import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
-
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const pageType = ref('add') // 页面类型: add, edit, detail
-const countryList = ref(countries) // 国家列表
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
-const mesureCategoryMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const mesureCategoryList = [
-  {
-    label: '检定',
-    value: 'jd',
-  },
-  {
-    label: '检测',
-    value: 'jc',
-  },
-  {
-    label: '验收检定',
-    value: 'ysjd',
-  },
-  {
-    label: '抽检',
-    value: 'cj',
-  },
-  {
-    label: '校准',
-    value: 'jz',
-  },
-  {
-    label: '测试',
-    value: 'cs',
-  },
-  {
-    label: '验收校准',
-    value: 'ysjz',
-  },
-]// 校检类别
-const mesureResultList = [
-  {
-    label: '合格',
-    value: 'hg',
-  },
-  {
-    label: '修后合格',
-    value: 'xhhg',
-  },
-  {
-    label: '限用',
-    value: 'xy',
-  },
-  {
-    label: '准用',
-    value: 'zy',
-  },
-  {
-    label: '不合格',
-    value: 'bhg',
-  },
-  {
-    label: '漏检',
-    value: 'lj',
-  },
-  {
-    label: '逾期未检定',
-    value: 'yqwjd',
-  },
-]// 检定结果
-const mesureResultMap = {
-  hg: '合格',
-  xhhg: '修后合格',
-  xy: '限用',
-  zy: '准用',
-  bhg: '不合格',
-  lj: '漏检',
-  yqwjd: '逾期未检定',
-}// 检定结果字典
-const measureTypeList = [
-  {
-    label: '自检',
-    value: '1',
-  },
-  {
-    label: '外包',
-    value: '2',
-  },
-  {
-    label: '外检',
-    value: '3',
-  },
-]// 检定方式
-const dataForm: Ref<ISampleDetail> = ref({
-  id: '',
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 样品型号
-  manufacturingNo: '', // 出厂编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
-  manufacturer: '', // 生产厂家
-  manufacturerCountry: '', // 厂家国别
-  manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  // deliverer: '', // 送检人
-  // delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
-  remark: '', // 备注
-  minioFileName: '', // 说明书
-  labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-})
-const ruleFormRef = ref<FormInstance>()
-
-// 自定义校验规则--检定周期为正整数
-const validateMesurePeriod = (rule: any, value: any, callback: any) => {
-  if (value === '') {
-    callback()
-  }
-  else if (!(/(^[1-9]\d*$)/.test(value))) {
-    callback(new Error('请输入一个正整数'))
-  }
-  else {
-    callback()
-  }
-}
-
-// 校验规则
-const rules = reactive<FormRules>({
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
-  sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
-  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
-  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
-  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
-  postalCode: [{ required: true, message: '委托方邮编不能为空', trigger: 'blur' }],
-  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
-  mesureContent: [{ required: true, message: '检定项目不能为空', trigger: 'blur' }],
-  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-}) // 表单验证规则
-
-// 其他关联数据列表
-const dataList = ref({
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
-})
-
-// 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
-}
-// 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
-}
-
-// 菜单
-const menu: Menu[] = [
-  {
-    name: '检定记录',
-    columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
-    ],
-    list: 'measureRecords',
-    pagination: true,
-    searchFunc: fetchMeasureRecords,
-  },
-  {
-    name: '检定证书',
-    columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
-    ],
-    list: 'certificationRecords',
-    pagination: true,
-    searchFunc: fetchCertifications,
-  },
-]
-
-const currentMenu = ref('检定记录')
-const currentMenuObj = computed(() => {
-  return menu.find(item => item.name === currentMenu.value)
-})
-
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-
-// 打印表单
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '样品详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        dataForm.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-
-// 委托方代码获取焦点
-const customerNoFocus = () => {
-  visible.value = true
-}
-
-// 选好委托方
-const confirmCheckout = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.companyAddress = getValue.briefName
-  }
-}
-
-// 控制选择委托方对话框显隐
-const changeVisible = (val: boolean) => {
-  visible.value = val
-}
-
-// 保存
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        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)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取详情
-const getInfo = () => {
-  getSapmleDetail({ id: infoId.value }).then((res) => {
-    res.data = {
-      ABC: 'A',
-      companyAddress: '北京/北京市',
-      customerName: '京东集团',
-      customerNo: 'sygf202211290001',
-      id: '',
-      labelBind: '11222',
-      manufacturer: '北京某厂家',
-      manufacturerCountry: 'CN',
-      manufacturingDate: '2023-03',
-      manufacturingNo: '123121',
-      mesureCategory: 'jd',
-      mesureContent: '项目1',
-      mesurePeriod: '1',
-      mesureType: 'zj',
-      minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-      phone: '950618',
-      postalCode: 'test',
-      remark: '无备注',
-      sampleModel: '型号1',
-      sampleName: '样品1',
-      sampleNo: '',
-      measureResultCode: 'bhg',
-    }
-    // dataForm.value = res.data
-    // dataForm.value.measureResult = mesureResultMap[dataForm.value.measureResultCode]
-    // for (const item of menu) {
-    //   item.searchFunc()
-    // }
-  })
-}
-
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`样品-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <div id="form">
-        <el-form
-          ref="ruleFormRef"
-          :model="dataForm"
-          :label-width="120"
-          label-position="right"
-          :rules="rules"
-        >
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="样品编号:" prop="sampleNo">
-                <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="样品名称:" prop="sampleName">
-                <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col><el-col :span="6">
-              <el-form-item label="样品型号:" prop="sampleModel">
-                <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂编号:" prop="manufacturingNo">
-                <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方代码" prop="customerNo">
-                <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @focus="customerNoFocus"
-                >
-                  <template #suffix>
-                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
-                      <search />
-                    </el-icon>
-                  </template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方名称" prop="customerName">
-                <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话" prop="phone">
-                <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方邮编" prop="postalCode">
-                <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="18">
-              <el-form-item label="委托方地址:" prop="companyAddress">
-                <el-input
-                  v-model="dataForm.companyAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="校检类别:">
-                <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="生产厂家:">
-                <el-input
-                  v-model="dataForm.manufacturer"
-                  :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.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂年月:">
-                <el-date-picker
-                  v-model="dataForm.manufacturingDate"
-                  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="ABC:">
-                <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="检定周期（月）:" prop="mesurePeriod">
-                <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="送检人:">
-                <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="联系方式:">
-                <el-input
-                  v-model="dataForm.delivererTel"
-                  :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"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标签绑定:">
-                <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="检定项目:" prop="mesureContent">
-                <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="备注:">
-                <el-input
-                  v-model="dataForm.remark"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </detail-page>
-
-    <!-- 检定记录、检定证书 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
-      <template #menu>
-        <el-radio-group v-model="currentMenu">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </template>
-      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
-    </detail-block-switch>
-
-    <!-- 选择委托方组件 -->
-    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 6e5c9b9..6b3eb34 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -1,88 +1,74 @@
+<!-- 设备收发列表 -->
 <script lang="ts" setup name="InterchangeList">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IListQuery, IinterchangeList } from './interchange_interface'
-import ButtonBox from './buttonBox.vue'
+import teminateDialog from '../components/terminateDialog.vue'
+import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   exportInterchangeList,
   getInterChangeList,
-  interchangeListBack,
-  interchangeListComplete,
-  interchangeListDelete,
-  interchangeListReturn,
-  interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
+  interchangeStatusChange,
 } from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import buttonBox from '@/components/buttonBox/buttonBox.vue'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
-
-// 是否加急
-const isUrgentMap = [
-  { label: '全部', value: '0' },
-  { label: '是', value: '1' },
-  { label: '否', value: '2' },
-]
-
-// 样品属性
-const sampleAttrMap = [
-  { label: '全部', value: '0' },
-  { label: '客户样品', value: '1' },
-  { label: '自有设备', value: '2' },
-]
-
-const currentMenu = ref('taking') // buttonBox菜单选中项
+const menu = ref<IMenu[]>([]) // 右上角菜单
+const currentMenu = ref('') // 选中的按钮
+const active = ref('') // 选中的按钮的code
+const terminateRef = ref() // 确认终止dialog
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
-  type: '',
+  sampleBelong: '', // 样品属性
+  sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
 // 表头待收入
 const columnsTaking = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
-
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '实际送达时间', value: 'deliverTime', align: 'center' },
+  { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
-  { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
 ])
 
@@ -94,66 +80,86 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
+const isUrgentMap = ref<dictType[]>([]) // 是否加急
+const sampleAttrMap = ref<dictType[]>([]) // 样品属性
+const sampleStatusMap = ref<dictType[]>([]) // 样品状态
+
+// 获取字典值
+async function getDict() {
+  // 是否加急
+  getDictByCode('isUrgent').then((response) => {
+    isUrgentMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value,
+      }
+    })
+    // 在已有的字典的基础上增加一个全部0进去
+    isUrgentMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2', // 是否加急全部后端定为2
+    })
+  })
+  // 样品属性
+  getDictByCode('sampleBelong').then((response) => {
+    sampleAttrMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value, // 后端需要int型，在此转换
+      }
+    })
+    // 在已有的字典的基础上增加一个全部进去
+    sampleAttrMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2',
+    })
+  })
+  // 样品状态
+  const res = await getDictByCode('sampleStatus')
+  sampleStatusMap.value = res.data.map((item: dictType) => {
+    return {
+      ...item,
+      value: parseInt(item.value as string), // 后端需要int型，在此转换
+    }
+  })
+  // 制作右上角的菜单
+  sampleStatusMap.value.forEach((item: dictType) => {
+    if (item.name === '待收入' || item.name === '待归还'
+      || item.name === '已归还' || item.name === '已超期') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+  menu.value.splice(1, 0, {
+    name: '已收入',
+    id: '2', // 后端规定已收入传2
+  })
+}
+
 // 数据查询
 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 || ''
-  listQuery.value.type = currentMenu.value
-  // getInterChangeList(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', // 预计送达时间
-  //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: 'test',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      orderCode: 'test', // 委托书编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      deliverer: 'test', // 送检人
-      isUrgent: '1', // 是否加急
-      sampleAttr: '1', // 样品属性
-      planDeliverTime: 'test', // 预计送达时间
-      deliverTime: 'test', // 实际送达时间
-      requireOverTime: 'test', // 要求检完时间
-      currentCertifications: '1', // 已出具证书总数
-      requireCertifications: '5', // 应出具证书总数
-      currentDeliver: 'test', // 当前检定环节
-    }].map((item: IinterchangeList) => {
-    return {
-      ...item,
-      Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
-    }
+  listQuery.value.sampleStatus = active.value
+  getInterChangeList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IinterchangeList) => {
+      return {
+        ...item,
+        Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
+        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
 }
 
@@ -166,17 +172,18 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    orderCode: '', // 委托书编号
+    orderNo: '', // 委托书编号
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    type: currentMenu.value,
+    sampleBelong: '', // 样品属性
+    sampleStatus: '',
     offset: 1,
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 多选发生改变时
@@ -195,11 +202,17 @@
   fetchData(true)
 }
 
-// 监听buttonBox切换
+// 按钮切换
 const changeCurrentButton = (val: string) => {
-  currentMenu.value = val
-  console.log(currentMenu.value)
-
+  active.value = val
+  const currentMenuItem = menu.value.find(item => item.id === val)
+  if (val === '2') {
+    currentMenu.value = '已收入'
+  }
+  else {
+    currentMenu.value = currentMenuItem!.name
+  }
+  window.sessionStorage.setItem('interchangeActive', val)
   fetchData(true)
 }
 
@@ -223,13 +236,13 @@
     const params = {
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
-      orderCode: listQuery.value.orderCode, // 委托书编号
+      orderNo: listQuery.value.orderNo, // 委托书编号
       customerId: listQuery.value.customerId, // 委托方代码
       startTime: listQuery.value.startTime, // 预计送达开始时间
       endTime: listQuery.value.endTime, // 预计送达结束时间
       isUrgent: listQuery.value.isUrgent, // 是否加急
-      sampleAttr: listQuery.value.sampleAttr, // 样品属性
-      type: currentMenu.value,
+      sampleBelong: listQuery.value.sampleBelong, // 样品属性
+      sampleStatus: active.value, // 样品状态
       ids: checkoutList.value,
     }
     exportInterchangeList(params).then((res) => {
@@ -256,15 +269,15 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'delete') { // 无需检测
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -272,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -280,7 +293,17 @@
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
+        let status
+        if (currentMenu.value === '已收入') {
+          status = '1'
+        }
+        if (currentMenu.value === '待归还') {
+          status = '2'
+        }
+        if (currentMenu.value === '已归还') {
+          status = '5'
+        }
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -288,15 +311,15 @@
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '6' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'urge') { // 催办 ------------------- 后端未开发完
+        interchangeListUrge({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -304,12 +327,7 @@
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success(`已${title}`)
-            fetchData(true)
-          }
-        })
+        terminateRef.value.initDialog(row)
       }
     })
 }
@@ -317,9 +335,9 @@
 // 打印列表
 function printList() {
   // 打印列
-  let column = columnsTaking.value
-  if (currentMenu.value === 'taking') {
-    column = columns.value
+  let column = columns.value
+  if (currentMenu.value === '待收入') {
+    column = columnsTaking.value
   }
   const properties = column.map((item) => {
     return {
@@ -341,10 +359,19 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
+  $router.push(`/sample/${pageType}/${row.sampleId}`)
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict() // 字典
+  if (window.sessionStorage.getItem('interchangeActive')) {
+    active.value = window.sessionStorage.getItem('interchangeActive')!
+  }
+  else {
+    active.value = '1' // 待收入
+  }
+  fetchData(true) // 列表数据
+})
 </script>
 
 <template>
@@ -371,7 +398,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.orderCode"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           class="short-input"
           clearable
@@ -403,17 +430,17 @@
           <el-option
             v-for="item in isUrgentMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
           <el-option
             v-for="item in sampleAttrMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
@@ -421,21 +448,21 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === 'taking'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === 'took' || currentMenu === 'overtime') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === 'returning'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
-        :data="list" :total="total" :columns="currentMenu === 'taking' ? columnsTaking : columns" :query="listQuery"
+        :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="240">
+          <el-table-column label="操作" align="center" fixed="right" width="270">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === '待收入'"
                 size="small"
                 type="primary"
                 link
@@ -452,7 +479,7 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === 'taking' || currentMenu === 'took' || currentMenu === 'returning')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === '待收入' || currentMenu === '已收入' || currentMenu === '待归还')"
                 size="small"
                 link
                 type="primary"
@@ -461,7 +488,7 @@
                 标签绑定
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="primary"
@@ -470,7 +497,7 @@
                 收入
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="danger"
@@ -479,7 +506,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
                 size="small"
                 link
                 type="primary"
@@ -488,7 +515,7 @@
                 完成
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === 'returning'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === '待归还'"
                 size="small"
                 link
                 type="primary"
@@ -497,7 +524,7 @@
                 归还
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === 'returning' || currentMenu === 'took' || currentMenu === 'returned')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === '待归还' || currentMenu === '已收入' || currentMenu === '已归还')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +533,7 @@
                 回退
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === 'overtime'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === '已超期'"
                 size="small"
                 link
                 type="primary"
@@ -515,7 +542,7 @@
                 催办
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/terminate') && (currentMenu === 'took' || currentMenu === 'overtime')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/terminate')"
                 size="small"
                 link
                 type="primary"
@@ -528,7 +555,9 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <!-- 终止弹窗 -->
+    <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts
index a7df4fd..e5140a4 100644
--- a/src/views/business/schedule/interchange/interchange_interface.ts
+++ b/src/views/business/schedule/interchange/interchange_interface.ts
@@ -3,13 +3,13 @@
 export interface IListQuery {
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
-  orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   customerId: string // 委托方代码
   startTime: string // 预计送达开始时间
   endTime: string // 预计送达结束时间
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
-  type: string // 类型（buttonBox）
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 样品状态
   offset: number
   limit: number
 }
@@ -20,23 +20,25 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   customerId: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送检人
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   planDeliverTime: string // 预计送达时间
   deliverTime: string // 实际送达时间
   requireOverTime: string // 要求检完时间
-  currentCertifications: string | number // 已出具证书总数
+  alreadyCertifications: string | number // 已出具证书总数
   requireCertifications: string | number // 应出具证书总数
   currentDeliver: string // 当前检定环节
+  orderId: string | number // 委托书id
+  sampleId: string | number// 样品id
 }
 
 // 检定记录
 export interface SimpleMeasureRecord {
-  orderCode: string // 委托单编号
+  orderNo: string // 委托单编号
   orderTime: string // 委托单日期
   customerCode: string // 委托人代码
   customerName: string // 委托人名称
@@ -93,3 +95,10 @@
   measureResult?: string // 检定结果
 }
 
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 2b57a17..ed11f7e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,23 +1,36 @@
-<script lang="ts" setup name="CustomerList">
+<script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import type { IReceiptDetail, dictType } from './receiptList-interface'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
+import selectOrder from './selectOrder.vue'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import selectSample from '@/views/business/schedule/order/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
-import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import BarCodeBind from '@/components/BarCodeBind/index.vue'
+import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
-const visible = ref(false) // 控制选择委托方对话框显隐
+const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const orderVisible = ref(false) // 控制委托书对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
-
-const ruleFormRef = ref()
+const minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
 // 表单
 const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -28,7 +41,7 @@
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方邮编
+  fax: '', // 委托方传真
   postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
   deliverer: '', // 送检人
@@ -41,9 +54,69 @@
   appearance: '', // 样品外观
   relyFile: '', // 依据文件
 })
+// 表单验证规则
+const rules = reactive<FormRules>({
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
+  certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
+  certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
+  certificationCompanyAddress: [{ required: true, message: '要求证书单位地址不能为空', trigger: 'blur' }],
+  reciever: [{ required: true, message: '要求接收人不能为空', trigger: 'blur' }],
+  recieverPhone: [{ required: true, message: '要求接收人电话/手机不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  fax: [{ required: true, message: '要求委托方传真不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  deliverer: [{ required: true, message: '要求送检人不能为空', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '要求送检人电话/手机不能为空', trigger: 'blur' }],
+  orderTime: [{ type: 'date', required: true, message: '要求委托日期不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', required: true, message: '要求完成时间不能为空', trigger: 'change' }],
+  deliverTime: [{ type: 'date', required: true, message: '要求交接时间不能为空', trigger: 'change' }],
+  measureCategory: [{ required: true, message: '要求校检类别不能为空', trigger: 'change' }],
+  secrecy: [{ required: true, message: '要求保密要求不能为空', trigger: 'change' }],
+})
+const list = ref<ISampleList[]>([])// 表格数据-样品
+// 选中的内容
+const checkoutList = ref([])
+// 表头
+const columns = ref([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号', value: 'sampleModel', align: 'center', required: true },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '外观', value: 'appearance', align: 'center' },
+  { text: '检定要求', value: 'measureRequire', align: 'center' },
+])
+
+// 签章查询数据
+const searchQuerySignature = reactive<queryType>({
+  signNo: 'qmqz202212050009', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '', // 1签名、2签章
+})
+// 签名查询数据
+const searchQueryAutograph = reactive<queryType>({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
 
 // 获取字典值
-function getDict() {
+async function getDict() {
   // 校检类别
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
@@ -77,8 +150,31 @@
   getDictByCode('secrecy').then((response) => {
     secrecyList.value = response.data
   })
+  // 获取类型（签名、签章）
+  const res = await getDictByCode('signType')
+  searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+  searchQueryAutograph.signType = res.data.filter((item: typeofSign) => item.name === '签名')[0].value
+  console.log(res.data.filter((item: typeofSign) => item.name === '签章')[0].value)
+  console.log(searchQuerySignature.signType)
+  console.log(searchQueryAutograph.signType)
 }
-getDict()
+
+// 获取签章数据
+const getSignatureList = () => {
+  listPageApi(searchQuerySignature).then((res) => {
+    if (res.code === 200) {
+      minioFileNameSignature.value = res.data.rows[0].minioFileName
+    }
+  })
+}
+// 获取签名数据
+const getAutographList = () => {
+  listPageApi(searchQueryAutograph).then((res) => {
+    if (res.code === 200) {
+      minioFileNameAutograph.value = res.data.rows[0].minioFileName
+    }
+  })
+}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
@@ -95,34 +191,148 @@
   $router.back()
 }
 
-// 选好委托方
-const confirmCheckout = (val: Array<ICustomer>) => {
-  // if (val && val.length) {
-  //   list.value = [] // 切换委托方时把样品清单置空
-  //   const getValue = val[0]
-  //   dataForm.value.customerNo = getValue.customerNo // 委托方代码
-  //   dataForm.value.customerId = getValue.id // 委托方id
-  //   dataForm.value.customerName = getValue.customerName // 委托方名称
-  //   dataForm.value.phone = getValue.phone // 委托方电话
-  //   dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
-  // }
-}
-
 // 点击提交
 const submit = () => {}
 
+// ------------------------委托书-----------------------------
 // 点击选择委托书编号
-const selectOrder = () => {
-
+const handleClickOrder = () => {
+  orderVisible.value = true
 }
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+  }
+}
+
+// ------------------------委托方-----------------------------
+// 点击选择委托方编号
+const handleClickCustomer = () => {
+  customerVisible.value = true
+}
+// 修改委托方对话框显隐
+const changeCustomerVisible = (val: boolean) => {
+  customerVisible.value = val
+}
+// 选好委托方
+const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    list.value = [] // 切换委托方时把样品清单置空
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
+    dataForm.value.fax = getValue.fax // 委托方传真
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// ------------------------样品-----------------------------
+// 点击批量增加
+const multiAdd = () => {
+  sampleVisible.value = true
+}
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: Array<ISampleList>) => {
+  if (val && val.length) {
+    val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+      if (index === -1) {
+        list.value.push({
+          ...item,
+        })
+      }
+    })
+  }
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index !== -1) {
+      list.value.splice(index, 1)
+    }
+  })
+}
+
+// 点击保存
+const saveForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (pageType.value === 'edit') { // 编辑
+          // updateOrder(params).then(() => {
+          //   ElMessage.success('已保存')
+          //   $router.go(-1)
+          // })
+        }
+        if (pageType.value === 'add') { // 新建
+          // addOrder(params).then(() => {
+          //   ElMessage.success('已保存')
+          //   $router.go(-1)
+          // })
+        }
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+// 接收人表单失去焦点--调用签名管理数据
+const receiverBlur = () => {
+  getAutographList()
+}
+
+onMounted(async () => {
+  if (pageType.value === 'add') {
+    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+  }
+  await getDict()
+  getSignatureList()
+})
 </script>
 
 <template>
   <app-container>
     <div id="main">
-      <div class="orderNo-title">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
         <span>交接单编号：</span>
-        <span>11111111</span>
+        <span>{{ dataForm.interchangeCode }}</span>
       </div>
       <div class="customer-title">
         <img src="@/assets/images/logo.png" class="img">
@@ -132,9 +342,6 @@
       </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="submit">
-            提交
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
           </el-button>
@@ -148,6 +355,7 @@
             :model="dataForm"
             :label-width="120"
             label-position="right"
+            :rules="rules"
           >
             <el-row :gutter="24">
               <el-col :span="6">
@@ -159,7 +367,7 @@
                     disabled
                   >
                     <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="selectOrder">
+                      <el-button size="small" @click="handleClickOrder">
                         选择
                       </el-button>
                     </template>
@@ -211,8 +419,6 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
                   <el-input
@@ -220,6 +426,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
+                    @blur="receiverBlur"
                   />
                 </el-form-item>
               </el-col>
@@ -234,6 +441,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
+
             <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="委托方代码:" prop="customerNo">
@@ -244,7 +452,7 @@
                     disabled
                   >
                     <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="selectCustomer">
+                      <el-button size="small" @click="handleClickCustomer">
                         选择
                       </el-button>
                     </template>
@@ -295,8 +503,6 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <el-input
@@ -317,6 +523,8 @@
                   />
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -327,7 +535,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
@@ -416,19 +624,19 @@
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="样品清单">
+      <detail-block title="被测样品列表">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            从样品库中添加
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-            增加行
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
             删除行
           </el-button>
         </template>
-        <!-- <el-table
+        <el-table
           :data="list"
           border
           style="width: 100%;"
@@ -445,33 +653,37 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
-                v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
-                :disabled="item.disabled"
-                class="input"
-              />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
-                <el-option
-                  v-for="i in powerVoltageMap"
-                  :key="i.value"
-                  :label="i.name"
-                  :value="i.value"
-                />
-              </el-select>
-              <span v-if="item.value === 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-            </template>
-          </el-table-column>
-        </el-table> -->
+          />
+        </el-table>
       </detail-block>
+      <!-- 签章部分 -->
+      <div class="receipt-signature">
+        <div class="content">
+          <span class="title">甲方</span>
+          <div class="deliverer-time">
+            <span class="text-title">送检人:</span>
+            <span class="time">时ㅤ间:</span>
+          </div>
+        </div>
+        <div class="content">
+          <span class="title">乙方</span>
 
+          <div class="deliverer-time">
+            <div class="img">
+              <show-photo height="111px" width="183px" :minio-file-name="minioFileNameSignature" />
+            </div>
+            <div class="img-name">
+              <show-photo height="100px" width="200px" :minio-file-name="minioFileNameAutograph" />
+            </div>
+
+            <span class="text-title">接收人:</span>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
       <!-- 公司信息 -->
       <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
@@ -485,13 +697,22 @@
       </div>
     </div>
     <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" /> -->
+    <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <!-- <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" /> -->
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 标签绑定 -->
+    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
+.orderNo-title {
+  font-size: 13px;
+  color: #606266;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
@@ -529,4 +750,58 @@
     }
   }
 }
+
+.receipt-signature {
+  display: flex;
+  justify-content: space-around;
+  // padding: 50px 250px 50px 150px;
+  padding: 50px;
+  font-size: 28px;
+  color: #000;
+  font-weight: 600;
+
+  .content {
+    display: flex;
+    position: relative;
+
+    .img {
+      position: absolute;
+      right: 0;
+      top: 0;
+      z-index: 2;
+    }
+
+    .img-name {
+      position: absolute;
+      left: 220px;
+      top: -30px;
+      z-index: 1;
+    }
+
+    .title {
+      margin-right: 32px;
+      letter-spacing: 6px;
+    }
+
+    .deliverer-time {
+      display: flex;
+      flex-direction: column;
+
+      .text-title {
+        letter-spacing: 2px;
+      }
+
+      .time {
+        margin-top: 30px;
+        letter-spacing: 2px;
+      }
+
+      .text {
+        font-size: 24px;
+        font-weight: 500;
+        margin-left: 10px;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index d9ed9d3..3decec5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -25,6 +25,7 @@
 
 // 详情表单
 export interface IReceiptDetail {
+  interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
@@ -49,6 +50,18 @@
   relyFile: string // 依据文件
 }
 
+// 样品清单
+export interface ISampleList {
+  id?: string
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  appendixDescn: string // 附件说明
+  appearance: string // 外观
+  measureRequire: string // 检定要求
+}
+
 // 字典
 export interface dictType {
   id: string
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index feb3507..03f3492 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="CustomerList">
+<!-- 设备交接单列表 -->
+<script lang="ts" setup name="ReceiptList">
 import type { DateModelType } from 'element-plus'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
@@ -6,6 +7,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -23,12 +25,12 @@
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center' },
+  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '接收人', value: 'reciever', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center' },
+  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
@@ -43,30 +45,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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1111',
-      interchangeCode: '1111', // 交接单编号
-      customerNo: '1111', // 委托方代码
-      customerName: '1111', // 委托方名称
-      reciever: '1111', // 接收人
-      deliverer: '1111', // 送样人
-      deliverTime: '1111', // 交接时间
-      remark: '1111', // 备注
-    },
-  ]
+  getReceiptList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 点击编辑/详情
@@ -81,13 +71,17 @@
 
 // 点击取消
 const handleCancle = (id: string) => {
-
+  deleteReceiptList({ id }).then(() => {
+    ElMessage.success('已取消')
+    fetchData(true)
+  })
 }
 
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -130,18 +124,21 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
+      interchangeCode: '', // 交接单编号
       customerNo: '', // 委托方代码
       customerName: '', // 委托方名称
+      reciever: '', // 接收人
       deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      startTime: '', // 交接开始时间
+      endTime: '', // 交接结束时间
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
-    // exportReceiptListList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '委托书列表.xlsx')
-    // })
+    exportReceiptList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备交接单列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
new file mode 100644
index 0000000..63c364f
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -0,0 +1,236 @@
+<!-- 选择委托书dialog -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQuery, IOrderList, dictType } from '@/views/business/schedule/order/orderList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrderList } from '@/api/business/schedule/order'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const isUrgentMap = ref<dictType[]>([]) // 是否加急
+const statusMap = ref<dictType[]>([]) // 接收状态
+
+// 获取字典值
+function getDict() {
+  // 是否加急
+  getDictByCode('isUrgent').then((response) => {
+    isUrgentMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: parseInt(item.value as string),
+      }
+    })
+    // 在已有的字典的基础上增加一个全部0进去
+    isUrgentMap.value.push({
+      id: '',
+      name: '全部',
+      value: 2, // 是否加急全部后端定为2
+    })
+  })
+  // 接收状态
+  getDictByCode('orderStatus').then((response) => {
+    statusMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: parseInt(item.value as string), // 后端需要int型，在此转换
+      }
+    })
+    // 在已有的字典的基础上增加一个全部0进去
+    statusMap.value.push({
+      id: '',
+      name: '全部',
+      value: 0,
+    })
+    console.log(statusMap.value)
+  })
+}
+getDict()
+
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  orderCode: '', // 委托书编号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  deliverer: '', // 送样人
+  isUrgent: 2, // 是否加急 2全部 1是 0否
+  status: 0, // 接收状态
+  offset: 1,
+  limit: 20,
+})
+
+const columns = ref<TableColumn[]>([
+  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px', fixed: true },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系方式', value: 'customerPhone', align: 'center' },
+  { text: '样品数量', value: 'sampleCount', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IOrderList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getOrderList(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
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    orderCode: '', // 委托书编号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    deliverer: '', // 送样人
+    isUrgent: 2, // 是否加急
+    status: 0, // 接收状态
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmOrder = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div>
+    <el-dialog v-model="visible" title="选择委托书" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.orderCode"
+            placeholder="委托书编号"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.customerNo"
+            placeholder="委托方代码"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.deliverer"
+            placeholder="送样人"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
+            <el-option
+              v-for="item in isUrgentMap"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
+            <el-option
+              v-for="item in statusMap"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmOrder">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 1c6231e..f80d0c5 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -86,7 +86,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" props="comments">
+          <el-form-item label="请输入退回原因" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
new file mode 100644
index 0000000..ef91bfd
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -0,0 +1,37 @@
+// 列表查询接口
+export interface IListQuery {
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  manufacturingNo: string	// 出厂编号
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  offset: number // 当前页
+  limit: number // 每页多少条
+}
+
+// 表格
+export interface IList {
+  id: string // 主键
+  originalRecordCode: string	// 原始记录单编号
+  originalRecordName: string // 原始记录名称
+  customerSampleInfo: { // 样品信息
+    sampleNo: string	// 样品编号
+    sampleName: string	// 样品名称
+    manufacturingNo: string	// 出厂编号
+    sampleModel: string // 样品型号
+  }
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  createTime: string // 创建时间
+  remark: string // 备注
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 48dd59c..98c4257 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -1,72 +1,78 @@
-<script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+<!-- 原始记录列表 -->
+<script lang="ts" setup name="PrimitiveLogList">
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import QrDialog from '@/components/QrDialog/index.vue'
+import type { IList, IListQuery, dictType } from './primitiveLogList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '', // 创建结束时间
-  createStartTime: '', // 创建开始时间
-  deptId: '', // 部门id
-  director: '', // 负责人
-  effectiveCompany: '', // 原始记录编号
-  ids: [], // 导出集合
-  trainEndTime: '', // 结束时间
-  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  trainStartTime: '', // 开始时间
-  testCategory: '', // 检测类别
+import { getDictByCode } from '@/api/system/dict'
+
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+// 查询条件
+const listQuery = ref<IListQuery>({
+  calibrationCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 多选选中
 const checkoutList = ref<string[]>([])
-const list = ref([]) // 数据列表
+const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
 
-const $router = useRouter()
+// 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = []
-  loadingTable.value = false
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name, // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
 }
-fetchData(true)
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
-const { proxy } = getCurrentInstance() as any
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
-  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
-  { text: '样品编号', value: 'text', align: 'center' },
-  { text: '样品名称', value: 'text', align: 'center' },
-  { text: '出厂编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '检校类别', value: 'text', align: 'center' },
-  { text: '创建人', value: 'text', align: 'center' },
-  { text: '创建时间', value: 'text', align: 'center' },
-  { text: '备注', value: 'text', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -75,53 +81,59 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '', // 创建结束时间
-    createStartTime: '', // 创建开始时间
-    deptId: '', // 部门id
-    director: '', // 负责人
-    effectiveCompany: '', // 原始记录编号
-    ids: [], // 导出集合
-    trainEndTime: '', // 结束时间
-    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    trainStartTime: '', // 开始时间
-    testCategory: '', // 检测类别
+    calibrationCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
-  trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      calibrationCategory: '',	// 校验类别
+      createUser: '',	// 创建人
+      manufacturingNo: '',	// 出厂编号
+      originalRecordCode: '',	// 原始记录单编号
+      sampleModel: '',	// 样品型号
+      sampleName: '',	// 样品名称
+      sampleNo: '',	// 样品编号
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    exportPrimitiveLogList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '原始记录列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  text: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IList, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/primitiveLogList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
-    `确认删除${row.text}吗？`,
+    `确认删除${row.originalRecordName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -130,28 +142,25 @@
     },
   )
     .then(() => {
-      // getListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      deletePrimitiveLogList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已删除')
+          fetchData(true)
+        }
+      })
     })
 }
 
-const handelClick = (text: string) => {}
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
+// 点击新建
 const add = () => {
   $router.push('/lab/primitiveLogList/add')
 }
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -162,6 +171,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -172,16 +182,21 @@
     }
   })
   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 => checkoutList.value.includes(item))
-    printJSON(printList, properties, '环境记录单列表')
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '原始记录单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
+})
 </script>
 
 <template>
@@ -189,57 +204,57 @@
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.effectiveCompany"
+          v-model.trim="listQuery.originalRecordCode"
           placeholder="原始记录编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.manufacturingNo"
           placeholder="出厂编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleModel"
           placeholder="型号"
           clearable
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.testCategory"
+          v-model="listQuery.calibrationCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
         >
           <el-option
-            v-for="item in testCategoryList"
-            :key="item.id"
+            v-for="item in mesureCategoryList"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"
+            :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.createUser"
           placeholder="创建人"
           clearable
         />
@@ -280,10 +295,10 @@
         @multiSelect="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/edit')"
                 size="small"
                 type="primary"
                 link
@@ -300,11 +315,11 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/delete')"
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c74b7dd..cd53837 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="EnvironmentalAdd">
+<script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -644,7 +644,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择检校时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -869,7 +869,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -883,7 +883,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
new file mode 100644
index 0000000..d5f85a0
--- /dev/null
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -0,0 +1,113 @@
+<!-- 终止操作 -->
+<script lang="ts" setup name="teminateDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import { interchangeListTerminate } from '../../../../api/business/schedule/interchangeList'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const formData = ref({
+  orderId: '', // 委托书id
+  reason: '', // 终止原因
+  sampleId: '', // 样品id
+  status: '5', // 样品状态
+})
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules = reactive<FormRules>({
+  reason: [{ required: true, message: '终止原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param orderId 委托书id
+ * @param sampleId 样品id
+ */
+function initDialog(row) {
+  // dataFormRef.value!.clearValidate()
+  formData.value.orderId = row.orderId
+  formData.value.sampleId = row.sampleId
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      // ElMessageBox.confirm(
+      //   '确认终止吗？',
+      //   '提示',
+      //   { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      // ).then(() => {
+      btnLoading.value = true
+      interchangeListTerminate(formData.value).then((res) => {
+        ElMessage.success('操作成功')
+        btnLoading.value = false
+        dialogVisible.value = false
+        emit('onSuccess')
+      }).catch((_) => {
+        btnLoading.value = false
+      })
+      // })
+    }
+  })
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="终止"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="请输入终止原因" prop="reason">
+            <el-input
+              v-model="formData.reason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm(dataFormRef)">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue
deleted file mode 100644
index dc864bd..0000000
--- a/src/views/business/schedule/interchange/buttonBox.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { DefaultProps } from 'element-plus'
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-// 按钮菜单
-const menu = [
-  { name: '待收入', id: 'taking' },
-  { name: '已收入', id: 'took' },
-  { name: '待归还', id: 'returning' },
-  { name: '已归还', id: 'returned' },
-  { name: '已超期', id: 'overtime' },
-]
-const current = ref('taking')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 76px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
deleted file mode 100644
index 27687fc..0000000
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ /dev/null
@@ -1,715 +0,0 @@
-<!-- 新建、编辑、详情 -->
-<script lang="ts" setup name="InterchangeEdit">
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ref } from 'vue'
-import { Search } from '@element-plus/icons-vue'
-import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
-import countries from '@/components/AddressSelect/country-code.json'
-import { UploadFile } from '@/api/measure/file'
-import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
-
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const pageType = ref('add') // 页面类型: add, edit, detail
-const countryList = ref(countries) // 国家列表
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
-const mesureCategoryMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const mesureCategoryList = [
-  {
-    label: '检定',
-    value: 'jd',
-  },
-  {
-    label: '检测',
-    value: 'jc',
-  },
-  {
-    label: '验收检定',
-    value: 'ysjd',
-  },
-  {
-    label: '抽检',
-    value: 'cj',
-  },
-  {
-    label: '校准',
-    value: 'jz',
-  },
-  {
-    label: '测试',
-    value: 'cs',
-  },
-  {
-    label: '验收校准',
-    value: 'ysjz',
-  },
-]// 校检类别
-const mesureResultList = [
-  {
-    label: '合格',
-    value: 'hg',
-  },
-  {
-    label: '修后合格',
-    value: 'xhhg',
-  },
-  {
-    label: '限用',
-    value: 'xy',
-  },
-  {
-    label: '准用',
-    value: 'zy',
-  },
-  {
-    label: '不合格',
-    value: 'bhg',
-  },
-  {
-    label: '漏检',
-    value: 'lj',
-  },
-  {
-    label: '逾期未检定',
-    value: 'yqwjd',
-  },
-]// 检定结果
-const mesureResultMap = {
-  hg: '合格',
-  xhhg: '修后合格',
-  xy: '限用',
-  zy: '准用',
-  bhg: '不合格',
-  lj: '漏检',
-  yqwjd: '逾期未检定',
-}// 检定结果字典
-const measureTypeList = [
-  {
-    label: '自检',
-    value: '1',
-  },
-  {
-    label: '外包',
-    value: '2',
-  },
-  {
-    label: '外检',
-    value: '3',
-  },
-]// 检定方式
-const dataForm: Ref<ISampleDetail> = ref({
-  id: '',
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 样品型号
-  manufacturingNo: '', // 出厂编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
-  manufacturer: '', // 生产厂家
-  manufacturerCountry: '', // 厂家国别
-  manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  // deliverer: '', // 送检人
-  // delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
-  remark: '', // 备注
-  minioFileName: '', // 说明书
-  labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-})
-const ruleFormRef = ref<FormInstance>()
-
-// 自定义校验规则--检定周期为正整数
-const validateMesurePeriod = (rule: any, value: any, callback: any) => {
-  if (value === '') {
-    callback()
-  }
-  else if (!(/(^[1-9]\d*$)/.test(value))) {
-    callback(new Error('请输入一个正整数'))
-  }
-  else {
-    callback()
-  }
-}
-
-// 校验规则
-const rules = reactive<FormRules>({
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
-  sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
-  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
-  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
-  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
-  postalCode: [{ required: true, message: '委托方邮编不能为空', trigger: 'blur' }],
-  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
-  mesureContent: [{ required: true, message: '检定项目不能为空', trigger: 'blur' }],
-  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-}) // 表单验证规则
-
-// 其他关联数据列表
-const dataList = ref({
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
-})
-
-// 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
-}
-// 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
-}
-
-// 菜单
-const menu: Menu[] = [
-  {
-    name: '检定记录',
-    columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
-    ],
-    list: 'measureRecords',
-    pagination: true,
-    searchFunc: fetchMeasureRecords,
-  },
-  {
-    name: '检定证书',
-    columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
-    ],
-    list: 'certificationRecords',
-    pagination: true,
-    searchFunc: fetchCertifications,
-  },
-]
-
-const currentMenu = ref('检定记录')
-const currentMenuObj = computed(() => {
-  return menu.find(item => item.name === currentMenu.value)
-})
-
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-
-// 打印表单
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '样品详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        dataForm.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-
-// 委托方代码获取焦点
-const customerNoFocus = () => {
-  visible.value = true
-}
-
-// 选好委托方
-const confirmCheckout = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.companyAddress = getValue.briefName
-  }
-}
-
-// 控制选择委托方对话框显隐
-const changeVisible = (val: boolean) => {
-  visible.value = val
-}
-
-// 保存
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        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)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取详情
-const getInfo = () => {
-  getSapmleDetail({ id: infoId.value }).then((res) => {
-    res.data = {
-      ABC: 'A',
-      companyAddress: '北京/北京市',
-      customerName: '京东集团',
-      customerNo: 'sygf202211290001',
-      id: '',
-      labelBind: '11222',
-      manufacturer: '北京某厂家',
-      manufacturerCountry: 'CN',
-      manufacturingDate: '2023-03',
-      manufacturingNo: '123121',
-      mesureCategory: 'jd',
-      mesureContent: '项目1',
-      mesurePeriod: '1',
-      mesureType: 'zj',
-      minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-      phone: '950618',
-      postalCode: 'test',
-      remark: '无备注',
-      sampleModel: '型号1',
-      sampleName: '样品1',
-      sampleNo: '',
-      measureResultCode: 'bhg',
-    }
-    // dataForm.value = res.data
-    // dataForm.value.measureResult = mesureResultMap[dataForm.value.measureResultCode]
-    // for (const item of menu) {
-    //   item.searchFunc()
-    // }
-  })
-}
-
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`样品-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <div id="form">
-        <el-form
-          ref="ruleFormRef"
-          :model="dataForm"
-          :label-width="120"
-          label-position="right"
-          :rules="rules"
-        >
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="样品编号:" prop="sampleNo">
-                <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="样品名称:" prop="sampleName">
-                <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col><el-col :span="6">
-              <el-form-item label="样品型号:" prop="sampleModel">
-                <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂编号:" prop="manufacturingNo">
-                <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方代码" prop="customerNo">
-                <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @focus="customerNoFocus"
-                >
-                  <template #suffix>
-                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
-                      <search />
-                    </el-icon>
-                  </template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方名称" prop="customerName">
-                <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话" prop="phone">
-                <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方邮编" prop="postalCode">
-                <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="18">
-              <el-form-item label="委托方地址:" prop="companyAddress">
-                <el-input
-                  v-model="dataForm.companyAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="校检类别:">
-                <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="生产厂家:">
-                <el-input
-                  v-model="dataForm.manufacturer"
-                  :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.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂年月:">
-                <el-date-picker
-                  v-model="dataForm.manufacturingDate"
-                  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="ABC:">
-                <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="检定周期（月）:" prop="mesurePeriod">
-                <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="送检人:">
-                <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="联系方式:">
-                <el-input
-                  v-model="dataForm.delivererTel"
-                  :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"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标签绑定:">
-                <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="检定项目:" prop="mesureContent">
-                <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="备注:">
-                <el-input
-                  v-model="dataForm.remark"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </detail-page>
-
-    <!-- 检定记录、检定证书 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
-      <template #menu>
-        <el-radio-group v-model="currentMenu">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </template>
-      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
-    </detail-block-switch>
-
-    <!-- 选择委托方组件 -->
-    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 6e5c9b9..6b3eb34 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -1,88 +1,74 @@
+<!-- 设备收发列表 -->
 <script lang="ts" setup name="InterchangeList">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IListQuery, IinterchangeList } from './interchange_interface'
-import ButtonBox from './buttonBox.vue'
+import teminateDialog from '../components/terminateDialog.vue'
+import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   exportInterchangeList,
   getInterChangeList,
-  interchangeListBack,
-  interchangeListComplete,
-  interchangeListDelete,
-  interchangeListReturn,
-  interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
+  interchangeStatusChange,
 } from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import buttonBox from '@/components/buttonBox/buttonBox.vue'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
-
-// 是否加急
-const isUrgentMap = [
-  { label: '全部', value: '0' },
-  { label: '是', value: '1' },
-  { label: '否', value: '2' },
-]
-
-// 样品属性
-const sampleAttrMap = [
-  { label: '全部', value: '0' },
-  { label: '客户样品', value: '1' },
-  { label: '自有设备', value: '2' },
-]
-
-const currentMenu = ref('taking') // buttonBox菜单选中项
+const menu = ref<IMenu[]>([]) // 右上角菜单
+const currentMenu = ref('') // 选中的按钮
+const active = ref('') // 选中的按钮的code
+const terminateRef = ref() // 确认终止dialog
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
-  type: '',
+  sampleBelong: '', // 样品属性
+  sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
 // 表头待收入
 const columnsTaking = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
-
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '实际送达时间', value: 'deliverTime', align: 'center' },
+  { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
-  { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
 ])
 
@@ -94,66 +80,86 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
+const isUrgentMap = ref<dictType[]>([]) // 是否加急
+const sampleAttrMap = ref<dictType[]>([]) // 样品属性
+const sampleStatusMap = ref<dictType[]>([]) // 样品状态
+
+// 获取字典值
+async function getDict() {
+  // 是否加急
+  getDictByCode('isUrgent').then((response) => {
+    isUrgentMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value,
+      }
+    })
+    // 在已有的字典的基础上增加一个全部0进去
+    isUrgentMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2', // 是否加急全部后端定为2
+    })
+  })
+  // 样品属性
+  getDictByCode('sampleBelong').then((response) => {
+    sampleAttrMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value, // 后端需要int型，在此转换
+      }
+    })
+    // 在已有的字典的基础上增加一个全部进去
+    sampleAttrMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2',
+    })
+  })
+  // 样品状态
+  const res = await getDictByCode('sampleStatus')
+  sampleStatusMap.value = res.data.map((item: dictType) => {
+    return {
+      ...item,
+      value: parseInt(item.value as string), // 后端需要int型，在此转换
+    }
+  })
+  // 制作右上角的菜单
+  sampleStatusMap.value.forEach((item: dictType) => {
+    if (item.name === '待收入' || item.name === '待归还'
+      || item.name === '已归还' || item.name === '已超期') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+  menu.value.splice(1, 0, {
+    name: '已收入',
+    id: '2', // 后端规定已收入传2
+  })
+}
+
 // 数据查询
 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 || ''
-  listQuery.value.type = currentMenu.value
-  // getInterChangeList(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', // 预计送达时间
-  //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: 'test',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      orderCode: 'test', // 委托书编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      deliverer: 'test', // 送检人
-      isUrgent: '1', // 是否加急
-      sampleAttr: '1', // 样品属性
-      planDeliverTime: 'test', // 预计送达时间
-      deliverTime: 'test', // 实际送达时间
-      requireOverTime: 'test', // 要求检完时间
-      currentCertifications: '1', // 已出具证书总数
-      requireCertifications: '5', // 应出具证书总数
-      currentDeliver: 'test', // 当前检定环节
-    }].map((item: IinterchangeList) => {
-    return {
-      ...item,
-      Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
-    }
+  listQuery.value.sampleStatus = active.value
+  getInterChangeList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IinterchangeList) => {
+      return {
+        ...item,
+        Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
+        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
 }
 
@@ -166,17 +172,18 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    orderCode: '', // 委托书编号
+    orderNo: '', // 委托书编号
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    type: currentMenu.value,
+    sampleBelong: '', // 样品属性
+    sampleStatus: '',
     offset: 1,
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 多选发生改变时
@@ -195,11 +202,17 @@
   fetchData(true)
 }
 
-// 监听buttonBox切换
+// 按钮切换
 const changeCurrentButton = (val: string) => {
-  currentMenu.value = val
-  console.log(currentMenu.value)
-
+  active.value = val
+  const currentMenuItem = menu.value.find(item => item.id === val)
+  if (val === '2') {
+    currentMenu.value = '已收入'
+  }
+  else {
+    currentMenu.value = currentMenuItem!.name
+  }
+  window.sessionStorage.setItem('interchangeActive', val)
   fetchData(true)
 }
 
@@ -223,13 +236,13 @@
     const params = {
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
-      orderCode: listQuery.value.orderCode, // 委托书编号
+      orderNo: listQuery.value.orderNo, // 委托书编号
       customerId: listQuery.value.customerId, // 委托方代码
       startTime: listQuery.value.startTime, // 预计送达开始时间
       endTime: listQuery.value.endTime, // 预计送达结束时间
       isUrgent: listQuery.value.isUrgent, // 是否加急
-      sampleAttr: listQuery.value.sampleAttr, // 样品属性
-      type: currentMenu.value,
+      sampleBelong: listQuery.value.sampleBelong, // 样品属性
+      sampleStatus: active.value, // 样品状态
       ids: checkoutList.value,
     }
     exportInterchangeList(params).then((res) => {
@@ -256,15 +269,15 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'delete') { // 无需检测
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -272,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -280,7 +293,17 @@
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
+        let status
+        if (currentMenu.value === '已收入') {
+          status = '1'
+        }
+        if (currentMenu.value === '待归还') {
+          status = '2'
+        }
+        if (currentMenu.value === '已归还') {
+          status = '5'
+        }
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -288,15 +311,15 @@
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '6' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'urge') { // 催办 ------------------- 后端未开发完
+        interchangeListUrge({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -304,12 +327,7 @@
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success(`已${title}`)
-            fetchData(true)
-          }
-        })
+        terminateRef.value.initDialog(row)
       }
     })
 }
@@ -317,9 +335,9 @@
 // 打印列表
 function printList() {
   // 打印列
-  let column = columnsTaking.value
-  if (currentMenu.value === 'taking') {
-    column = columns.value
+  let column = columns.value
+  if (currentMenu.value === '待收入') {
+    column = columnsTaking.value
   }
   const properties = column.map((item) => {
     return {
@@ -341,10 +359,19 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
+  $router.push(`/sample/${pageType}/${row.sampleId}`)
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict() // 字典
+  if (window.sessionStorage.getItem('interchangeActive')) {
+    active.value = window.sessionStorage.getItem('interchangeActive')!
+  }
+  else {
+    active.value = '1' // 待收入
+  }
+  fetchData(true) // 列表数据
+})
 </script>
 
 <template>
@@ -371,7 +398,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.orderCode"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           class="short-input"
           clearable
@@ -403,17 +430,17 @@
           <el-option
             v-for="item in isUrgentMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
           <el-option
             v-for="item in sampleAttrMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
@@ -421,21 +448,21 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === 'taking'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === 'took' || currentMenu === 'overtime') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === 'returning'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
-        :data="list" :total="total" :columns="currentMenu === 'taking' ? columnsTaking : columns" :query="listQuery"
+        :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="240">
+          <el-table-column label="操作" align="center" fixed="right" width="270">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === '待收入'"
                 size="small"
                 type="primary"
                 link
@@ -452,7 +479,7 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === 'taking' || currentMenu === 'took' || currentMenu === 'returning')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === '待收入' || currentMenu === '已收入' || currentMenu === '待归还')"
                 size="small"
                 link
                 type="primary"
@@ -461,7 +488,7 @@
                 标签绑定
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="primary"
@@ -470,7 +497,7 @@
                 收入
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="danger"
@@ -479,7 +506,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
                 size="small"
                 link
                 type="primary"
@@ -488,7 +515,7 @@
                 完成
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === 'returning'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === '待归还'"
                 size="small"
                 link
                 type="primary"
@@ -497,7 +524,7 @@
                 归还
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === 'returning' || currentMenu === 'took' || currentMenu === 'returned')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === '待归还' || currentMenu === '已收入' || currentMenu === '已归还')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +533,7 @@
                 回退
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === 'overtime'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === '已超期'"
                 size="small"
                 link
                 type="primary"
@@ -515,7 +542,7 @@
                 催办
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/terminate') && (currentMenu === 'took' || currentMenu === 'overtime')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/terminate')"
                 size="small"
                 link
                 type="primary"
@@ -528,7 +555,9 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <!-- 终止弹窗 -->
+    <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts
index a7df4fd..e5140a4 100644
--- a/src/views/business/schedule/interchange/interchange_interface.ts
+++ b/src/views/business/schedule/interchange/interchange_interface.ts
@@ -3,13 +3,13 @@
 export interface IListQuery {
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
-  orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   customerId: string // 委托方代码
   startTime: string // 预计送达开始时间
   endTime: string // 预计送达结束时间
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
-  type: string // 类型（buttonBox）
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 样品状态
   offset: number
   limit: number
 }
@@ -20,23 +20,25 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   customerId: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送检人
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   planDeliverTime: string // 预计送达时间
   deliverTime: string // 实际送达时间
   requireOverTime: string // 要求检完时间
-  currentCertifications: string | number // 已出具证书总数
+  alreadyCertifications: string | number // 已出具证书总数
   requireCertifications: string | number // 应出具证书总数
   currentDeliver: string // 当前检定环节
+  orderId: string | number // 委托书id
+  sampleId: string | number// 样品id
 }
 
 // 检定记录
 export interface SimpleMeasureRecord {
-  orderCode: string // 委托单编号
+  orderNo: string // 委托单编号
   orderTime: string // 委托单日期
   customerCode: string // 委托人代码
   customerName: string // 委托人名称
@@ -93,3 +95,10 @@
   measureResult?: string // 检定结果
 }
 
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 2b57a17..ed11f7e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,23 +1,36 @@
-<script lang="ts" setup name="CustomerList">
+<script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import type { IReceiptDetail, dictType } from './receiptList-interface'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
+import selectOrder from './selectOrder.vue'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import selectSample from '@/views/business/schedule/order/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
-import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import BarCodeBind from '@/components/BarCodeBind/index.vue'
+import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
-const visible = ref(false) // 控制选择委托方对话框显隐
+const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const orderVisible = ref(false) // 控制委托书对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
-
-const ruleFormRef = ref()
+const minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
 // 表单
 const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -28,7 +41,7 @@
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方邮编
+  fax: '', // 委托方传真
   postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
   deliverer: '', // 送检人
@@ -41,9 +54,69 @@
   appearance: '', // 样品外观
   relyFile: '', // 依据文件
 })
+// 表单验证规则
+const rules = reactive<FormRules>({
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
+  certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
+  certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
+  certificationCompanyAddress: [{ required: true, message: '要求证书单位地址不能为空', trigger: 'blur' }],
+  reciever: [{ required: true, message: '要求接收人不能为空', trigger: 'blur' }],
+  recieverPhone: [{ required: true, message: '要求接收人电话/手机不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  fax: [{ required: true, message: '要求委托方传真不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  deliverer: [{ required: true, message: '要求送检人不能为空', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '要求送检人电话/手机不能为空', trigger: 'blur' }],
+  orderTime: [{ type: 'date', required: true, message: '要求委托日期不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', required: true, message: '要求完成时间不能为空', trigger: 'change' }],
+  deliverTime: [{ type: 'date', required: true, message: '要求交接时间不能为空', trigger: 'change' }],
+  measureCategory: [{ required: true, message: '要求校检类别不能为空', trigger: 'change' }],
+  secrecy: [{ required: true, message: '要求保密要求不能为空', trigger: 'change' }],
+})
+const list = ref<ISampleList[]>([])// 表格数据-样品
+// 选中的内容
+const checkoutList = ref([])
+// 表头
+const columns = ref([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号', value: 'sampleModel', align: 'center', required: true },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '外观', value: 'appearance', align: 'center' },
+  { text: '检定要求', value: 'measureRequire', align: 'center' },
+])
+
+// 签章查询数据
+const searchQuerySignature = reactive<queryType>({
+  signNo: 'qmqz202212050009', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '', // 1签名、2签章
+})
+// 签名查询数据
+const searchQueryAutograph = reactive<queryType>({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
 
 // 获取字典值
-function getDict() {
+async function getDict() {
   // 校检类别
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
@@ -77,8 +150,31 @@
   getDictByCode('secrecy').then((response) => {
     secrecyList.value = response.data
   })
+  // 获取类型（签名、签章）
+  const res = await getDictByCode('signType')
+  searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+  searchQueryAutograph.signType = res.data.filter((item: typeofSign) => item.name === '签名')[0].value
+  console.log(res.data.filter((item: typeofSign) => item.name === '签章')[0].value)
+  console.log(searchQuerySignature.signType)
+  console.log(searchQueryAutograph.signType)
 }
-getDict()
+
+// 获取签章数据
+const getSignatureList = () => {
+  listPageApi(searchQuerySignature).then((res) => {
+    if (res.code === 200) {
+      minioFileNameSignature.value = res.data.rows[0].minioFileName
+    }
+  })
+}
+// 获取签名数据
+const getAutographList = () => {
+  listPageApi(searchQueryAutograph).then((res) => {
+    if (res.code === 200) {
+      minioFileNameAutograph.value = res.data.rows[0].minioFileName
+    }
+  })
+}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
@@ -95,34 +191,148 @@
   $router.back()
 }
 
-// 选好委托方
-const confirmCheckout = (val: Array<ICustomer>) => {
-  // if (val && val.length) {
-  //   list.value = [] // 切换委托方时把样品清单置空
-  //   const getValue = val[0]
-  //   dataForm.value.customerNo = getValue.customerNo // 委托方代码
-  //   dataForm.value.customerId = getValue.id // 委托方id
-  //   dataForm.value.customerName = getValue.customerName // 委托方名称
-  //   dataForm.value.phone = getValue.phone // 委托方电话
-  //   dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
-  // }
-}
-
 // 点击提交
 const submit = () => {}
 
+// ------------------------委托书-----------------------------
 // 点击选择委托书编号
-const selectOrder = () => {
-
+const handleClickOrder = () => {
+  orderVisible.value = true
 }
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+  }
+}
+
+// ------------------------委托方-----------------------------
+// 点击选择委托方编号
+const handleClickCustomer = () => {
+  customerVisible.value = true
+}
+// 修改委托方对话框显隐
+const changeCustomerVisible = (val: boolean) => {
+  customerVisible.value = val
+}
+// 选好委托方
+const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    list.value = [] // 切换委托方时把样品清单置空
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
+    dataForm.value.fax = getValue.fax // 委托方传真
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// ------------------------样品-----------------------------
+// 点击批量增加
+const multiAdd = () => {
+  sampleVisible.value = true
+}
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: Array<ISampleList>) => {
+  if (val && val.length) {
+    val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+      if (index === -1) {
+        list.value.push({
+          ...item,
+        })
+      }
+    })
+  }
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index !== -1) {
+      list.value.splice(index, 1)
+    }
+  })
+}
+
+// 点击保存
+const saveForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (pageType.value === 'edit') { // 编辑
+          // updateOrder(params).then(() => {
+          //   ElMessage.success('已保存')
+          //   $router.go(-1)
+          // })
+        }
+        if (pageType.value === 'add') { // 新建
+          // addOrder(params).then(() => {
+          //   ElMessage.success('已保存')
+          //   $router.go(-1)
+          // })
+        }
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+// 接收人表单失去焦点--调用签名管理数据
+const receiverBlur = () => {
+  getAutographList()
+}
+
+onMounted(async () => {
+  if (pageType.value === 'add') {
+    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+  }
+  await getDict()
+  getSignatureList()
+})
 </script>
 
 <template>
   <app-container>
     <div id="main">
-      <div class="orderNo-title">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
         <span>交接单编号：</span>
-        <span>11111111</span>
+        <span>{{ dataForm.interchangeCode }}</span>
       </div>
       <div class="customer-title">
         <img src="@/assets/images/logo.png" class="img">
@@ -132,9 +342,6 @@
       </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="submit">
-            提交
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
           </el-button>
@@ -148,6 +355,7 @@
             :model="dataForm"
             :label-width="120"
             label-position="right"
+            :rules="rules"
           >
             <el-row :gutter="24">
               <el-col :span="6">
@@ -159,7 +367,7 @@
                     disabled
                   >
                     <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="selectOrder">
+                      <el-button size="small" @click="handleClickOrder">
                         选择
                       </el-button>
                     </template>
@@ -211,8 +419,6 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
                   <el-input
@@ -220,6 +426,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
+                    @blur="receiverBlur"
                   />
                 </el-form-item>
               </el-col>
@@ -234,6 +441,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
+
             <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="委托方代码:" prop="customerNo">
@@ -244,7 +452,7 @@
                     disabled
                   >
                     <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="selectCustomer">
+                      <el-button size="small" @click="handleClickCustomer">
                         选择
                       </el-button>
                     </template>
@@ -295,8 +503,6 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <el-input
@@ -317,6 +523,8 @@
                   />
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -327,7 +535,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
@@ -416,19 +624,19 @@
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="样品清单">
+      <detail-block title="被测样品列表">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            从样品库中添加
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-            增加行
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
             删除行
           </el-button>
         </template>
-        <!-- <el-table
+        <el-table
           :data="list"
           border
           style="width: 100%;"
@@ -445,33 +653,37 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
-                v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
-                :disabled="item.disabled"
-                class="input"
-              />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
-                <el-option
-                  v-for="i in powerVoltageMap"
-                  :key="i.value"
-                  :label="i.name"
-                  :value="i.value"
-                />
-              </el-select>
-              <span v-if="item.value === 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-            </template>
-          </el-table-column>
-        </el-table> -->
+          />
+        </el-table>
       </detail-block>
+      <!-- 签章部分 -->
+      <div class="receipt-signature">
+        <div class="content">
+          <span class="title">甲方</span>
+          <div class="deliverer-time">
+            <span class="text-title">送检人:</span>
+            <span class="time">时ㅤ间:</span>
+          </div>
+        </div>
+        <div class="content">
+          <span class="title">乙方</span>
 
+          <div class="deliverer-time">
+            <div class="img">
+              <show-photo height="111px" width="183px" :minio-file-name="minioFileNameSignature" />
+            </div>
+            <div class="img-name">
+              <show-photo height="100px" width="200px" :minio-file-name="minioFileNameAutograph" />
+            </div>
+
+            <span class="text-title">接收人:</span>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
       <!-- 公司信息 -->
       <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
@@ -485,13 +697,22 @@
       </div>
     </div>
     <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" /> -->
+    <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <!-- <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" /> -->
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 标签绑定 -->
+    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
+.orderNo-title {
+  font-size: 13px;
+  color: #606266;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
@@ -529,4 +750,58 @@
     }
   }
 }
+
+.receipt-signature {
+  display: flex;
+  justify-content: space-around;
+  // padding: 50px 250px 50px 150px;
+  padding: 50px;
+  font-size: 28px;
+  color: #000;
+  font-weight: 600;
+
+  .content {
+    display: flex;
+    position: relative;
+
+    .img {
+      position: absolute;
+      right: 0;
+      top: 0;
+      z-index: 2;
+    }
+
+    .img-name {
+      position: absolute;
+      left: 220px;
+      top: -30px;
+      z-index: 1;
+    }
+
+    .title {
+      margin-right: 32px;
+      letter-spacing: 6px;
+    }
+
+    .deliverer-time {
+      display: flex;
+      flex-direction: column;
+
+      .text-title {
+        letter-spacing: 2px;
+      }
+
+      .time {
+        margin-top: 30px;
+        letter-spacing: 2px;
+      }
+
+      .text {
+        font-size: 24px;
+        font-weight: 500;
+        margin-left: 10px;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index d9ed9d3..3decec5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -25,6 +25,7 @@
 
 // 详情表单
 export interface IReceiptDetail {
+  interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
@@ -49,6 +50,18 @@
   relyFile: string // 依据文件
 }
 
+// 样品清单
+export interface ISampleList {
+  id?: string
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  appendixDescn: string // 附件说明
+  appearance: string // 外观
+  measureRequire: string // 检定要求
+}
+
 // 字典
 export interface dictType {
   id: string
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index feb3507..03f3492 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="CustomerList">
+<!-- 设备交接单列表 -->
+<script lang="ts" setup name="ReceiptList">
 import type { DateModelType } from 'element-plus'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
@@ -6,6 +7,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -23,12 +25,12 @@
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center' },
+  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '接收人', value: 'reciever', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center' },
+  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
@@ -43,30 +45,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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1111',
-      interchangeCode: '1111', // 交接单编号
-      customerNo: '1111', // 委托方代码
-      customerName: '1111', // 委托方名称
-      reciever: '1111', // 接收人
-      deliverer: '1111', // 送样人
-      deliverTime: '1111', // 交接时间
-      remark: '1111', // 备注
-    },
-  ]
+  getReceiptList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 点击编辑/详情
@@ -81,13 +71,17 @@
 
 // 点击取消
 const handleCancle = (id: string) => {
-
+  deleteReceiptList({ id }).then(() => {
+    ElMessage.success('已取消')
+    fetchData(true)
+  })
 }
 
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -130,18 +124,21 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
+      interchangeCode: '', // 交接单编号
       customerNo: '', // 委托方代码
       customerName: '', // 委托方名称
+      reciever: '', // 接收人
       deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      startTime: '', // 交接开始时间
+      endTime: '', // 交接结束时间
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
-    // exportReceiptListList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '委托书列表.xlsx')
-    // })
+    exportReceiptList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备交接单列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
new file mode 100644
index 0000000..63c364f
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -0,0 +1,236 @@
+<!-- 选择委托书dialog -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQuery, IOrderList, dictType } from '@/views/business/schedule/order/orderList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrderList } from '@/api/business/schedule/order'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const isUrgentMap = ref<dictType[]>([]) // 是否加急
+const statusMap = ref<dictType[]>([]) // 接收状态
+
+// 获取字典值
+function getDict() {
+  // 是否加急
+  getDictByCode('isUrgent').then((response) => {
+    isUrgentMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: parseInt(item.value as string),
+      }
+    })
+    // 在已有的字典的基础上增加一个全部0进去
+    isUrgentMap.value.push({
+      id: '',
+      name: '全部',
+      value: 2, // 是否加急全部后端定为2
+    })
+  })
+  // 接收状态
+  getDictByCode('orderStatus').then((response) => {
+    statusMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: parseInt(item.value as string), // 后端需要int型，在此转换
+      }
+    })
+    // 在已有的字典的基础上增加一个全部0进去
+    statusMap.value.push({
+      id: '',
+      name: '全部',
+      value: 0,
+    })
+    console.log(statusMap.value)
+  })
+}
+getDict()
+
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  orderCode: '', // 委托书编号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  deliverer: '', // 送样人
+  isUrgent: 2, // 是否加急 2全部 1是 0否
+  status: 0, // 接收状态
+  offset: 1,
+  limit: 20,
+})
+
+const columns = ref<TableColumn[]>([
+  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px', fixed: true },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系方式', value: 'customerPhone', align: 'center' },
+  { text: '样品数量', value: 'sampleCount', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IOrderList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getOrderList(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
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    orderCode: '', // 委托书编号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    deliverer: '', // 送样人
+    isUrgent: 2, // 是否加急
+    status: 0, // 接收状态
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmOrder = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div>
+    <el-dialog v-model="visible" title="选择委托书" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.orderCode"
+            placeholder="委托书编号"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.customerNo"
+            placeholder="委托方代码"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.deliverer"
+            placeholder="送样人"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
+            <el-option
+              v-for="item in isUrgentMap"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
+            <el-option
+              v-for="item in statusMap"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmOrder">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 043fb70..8b924de 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -182,6 +182,8 @@
       deliverer: '', // 送样人
       isUrgent: 2, // 是否加急
       status: 0, // 接收状态
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     exportOrderList(params).then((res) => {

diff --git a/src/api/business/lab/primitiveLogList.ts b/src/api/business/lab/primitiveLogList.ts
new file mode 100644
index 0000000..1d63e01
--- /dev/null
+++ b/src/api/business/lab/primitiveLogList.ts
@@ -0,0 +1,35 @@
+/**
+ * 原始记录接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/lab/primitiveLog/primitiveLogList'
+const prefix = '/business/originalRecord'
+
+// 列表查询
+export function getPrimitiveLogList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportPrimitiveLogList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 删除
+export function deletePrimitiveLogList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 0dbb5af..5054378 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -3,12 +3,11 @@
 */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
 
 // 列表查询
 export function getInterChangeList(data: IListQuery) {
   return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: `/device/dispatch/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
@@ -17,7 +16,7 @@
 // 导出列表
 export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
   return request({
-    url: `${prefix}/schedule/interChange/listExport`,
+    url: '/device/dispatch/export',
     method: 'post',
     responseType: 'blob',
     data,
@@ -25,63 +24,27 @@
 }
 
 // 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
+export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
+    url: '/device/dispatch/satus/change',
     method: 'post',
     data,
   })
 }
 
 // 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
+export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/urge`,
+    url: '/device/dispatch/rushDoProcess',
     method: 'post',
     data,
   })
 }
 
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
+// 根据样品id终止、完成
+export function interchangeListTerminate(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: `${prefix}/schedule/interChange/terminate`,
+    url: '/device/dispatch/terminate',
     method: 'post',
     data,
   })
diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
new file mode 100644
index 0000000..0b33406
--- /dev/null
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -0,0 +1,34 @@
+/**
+ * 设备交接单
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+const prefix = '/business/interchange'
+
+// 列表查询
+export function getReceiptList(data: IListQuery) {
+  return request({
+    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportReceiptList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/export`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 取消
+export function deleteReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/components/rollbackDialog.vue b/src/views/business/lab/components/rollbackDialog.vue
index 1c6231e..f80d0c5 100644
--- a/src/views/business/lab/components/rollbackDialog.vue
+++ b/src/views/business/lab/components/rollbackDialog.vue
@@ -86,7 +86,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item label="请输入退回原因" props="comments">
+          <el-form-item label="请输入退回原因" prop="comments">
             <el-input
               v-model="formData.comments"
               :rows="4"
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
new file mode 100644
index 0000000..ef91bfd
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -0,0 +1,37 @@
+// 列表查询接口
+export interface IListQuery {
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  manufacturingNo: string	// 出厂编号
+  originalRecordCode: string	// 原始记录单编号
+  sampleModel: string	// 样品型号
+  sampleName: string	// 样品名称
+  sampleNo: string	// 样品编号
+  offset: number // 当前页
+  limit: number // 每页多少条
+}
+
+// 表格
+export interface IList {
+  id: string // 主键
+  originalRecordCode: string	// 原始记录单编号
+  originalRecordName: string // 原始记录名称
+  customerSampleInfo: { // 样品信息
+    sampleNo: string	// 样品编号
+    sampleName: string	// 样品名称
+    manufacturingNo: string	// 出厂编号
+    sampleModel: string // 样品型号
+  }
+  calibrationCategory: string	// 校验类别
+  createUser: string	// 创建人
+  createTime: string // 创建时间
+  remark: string // 备注
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 48dd59c..98c4257 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -1,72 +1,78 @@
-<script lang="ts" setup name="EnvironmentalList">
-import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+<!-- 原始记录列表 -->
+<script lang="ts" setup name="PrimitiveLogList">
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import QrDialog from '@/components/QrDialog/index.vue'
+import type { IList, IListQuery, dictType } from './primitiveLogList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
-import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '', // 创建结束时间
-  createStartTime: '', // 创建开始时间
-  deptId: '', // 部门id
-  director: '', // 负责人
-  effectiveCompany: '', // 原始记录编号
-  ids: [], // 导出集合
-  trainEndTime: '', // 结束时间
-  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  trainStartTime: '', // 开始时间
-  testCategory: '', // 检测类别
+import { getDictByCode } from '@/api/system/dict'
+
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+// 查询条件
+const listQuery = ref<IListQuery>({
+  calibrationCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 多选选中
 const checkoutList = ref<string[]>([])
-const list = ref([]) // 数据列表
+const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
 
-const loadingTable = ref(false)
-// 初始化路由
-// 培训时间数组
-const trainTime = ref('')
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
 
-const $router = useRouter()
+// 列表数据查询
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTime.value[0] || ''
-  listQuery.value.trainEndTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = []
-  loadingTable.value = false
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name, // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
 }
-fetchData(true)
-// 检测类别下拉框数组
-const testCategoryList = [
-  { name: '检定', id: '1' },
-  { name: '检测', id: '2' },
-  { name: '验收鉴定', id: '3' },
-  { name: '校准', id: '4' },
-  { name: '测试', id: '5' },
-]
-const { proxy } = getCurrentInstance() as any
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
-  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
-  { text: '样品编号', value: 'text', align: 'center' },
-  { text: '样品名称', value: 'text', align: 'center' },
-  { text: '出厂编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '检校类别', value: 'text', align: 'center' },
-  { text: '创建人', value: 'text', align: 'center' },
-  { text: '创建时间', value: 'text', align: 'center' },
-  { text: '备注', value: 'text', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -75,53 +81,59 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '', // 创建结束时间
-    createStartTime: '', // 创建开始时间
-    deptId: '', // 部门id
-    director: '', // 负责人
-    effectiveCompany: '', // 原始记录编号
-    ids: [], // 导出集合
-    trainEndTime: '', // 结束时间
-    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    trainStartTime: '', // 开始时间
-    testCategory: '', // 检测类别
+    calibrationCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
-  trainTime.value = ''
   fetchData(true)
 }
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  // if (list.value.length > 0) {
-  // }
-  // else {
-  //   ElMessage.warning('无数据可导出数据')
-  // }
+  if (list.value.length > 0) {
+    const params = {
+      calibrationCategory: '',	// 校验类别
+      createUser: '',	// 创建人
+      manufacturingNo: '',	// 出厂编号
+      originalRecordCode: '',	// 原始记录单编号
+      sampleModel: '',	// 样品型号
+      sampleName: '',	// 样品名称
+      sampleNo: '',	// 样品编号
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    exportPrimitiveLogList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '原始记录列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
-// 关闭编辑
-const close = () => {
-  fetchData(true)
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  text: string
-}
+
 // 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+const handleEdit = (row: IList, pageType: 'edit' | 'detail') => {
   $router.push(`/lab/primitiveLogList/${pageType}/${row.id}`)
 }
+
 // 点击删除
-const handleDelete = (index: string, row: rowReturn) => {
+const handleDelete = (row: IList) => {
   ElMessageBox.confirm(
-    `确认删除${row.text}吗？`,
+    `确认删除${row.originalRecordName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -130,28 +142,25 @@
     },
   )
     .then(() => {
-      // getListDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      deletePrimitiveLogList({ id: row.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('已删除')
+          fetchData(true)
+        }
+      })
     })
 }
 
-const handelClick = (text: string) => {}
+// 多选选中
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
+// 点击新建
 const add = () => {
   $router.push('/lab/primitiveLogList/add')
 }
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -162,6 +171,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -172,16 +182,21 @@
     }
   })
   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 => checkoutList.value.includes(item))
-    printJSON(printList, properties, '环境记录单列表')
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '原始记录单列表')
   }
   else {
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  fetchData(true) // 获取列表数据
+})
 </script>
 
 <template>
@@ -189,57 +204,57 @@
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.effectiveCompany"
+          v-model.trim="listQuery.originalRecordCode"
           placeholder="原始记录编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleName"
           placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.manufacturingNo"
           placeholder="出厂编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.sampleModel"
           placeholder="型号"
           clearable
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.testCategory"
+          v-model="listQuery.calibrationCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
         >
           <el-option
-            v-for="item in testCategoryList"
-            :key="item.id"
+            v-for="item in mesureCategoryList"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"
+            :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.director"
+          v-model.trim="listQuery.createUser"
           placeholder="创建人"
           clearable
         />
@@ -280,10 +295,10 @@
         @multiSelect="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="190">
+          <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/edit')"
                 size="small"
                 type="primary"
                 link
@@ -300,11 +315,11 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                v-if="proxy.hasPerm('/lab/primitiveLogList/delete')"
                 size="small"
                 link
                 type="danger"
-                @click="handleDelete(row.$index, row)"
+                @click="handleDelete(row)"
               >
                 删除
               </el-button>
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index c74b7dd..cd53837 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -1,4 +1,4 @@
-<script lang="ts" setup name="EnvironmentalAdd">
+<script lang="ts" setup name="primitiveLogAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
@@ -644,7 +644,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择检校时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -869,7 +869,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -883,7 +883,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD hh:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/components/terminateDialog.vue b/src/views/business/schedule/components/terminateDialog.vue
new file mode 100644
index 0000000..d5f85a0
--- /dev/null
+++ b/src/views/business/schedule/components/terminateDialog.vue
@@ -0,0 +1,113 @@
+<!-- 终止操作 -->
+<script lang="ts" setup name="teminateDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
+import { interchangeListTerminate } from '../../../../api/business/schedule/interchangeList'
+
+// 对外暴露的方法： 退回成功
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const formData = ref({
+  orderId: '', // 委托书id
+  reason: '', // 终止原因
+  sampleId: '', // 样品id
+  status: '5', // 样品状态
+})
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules = reactive<FormRules>({
+  reason: [{ required: true, message: '终止原因必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param orderId 委托书id
+ * @param sampleId 样品id
+ */
+function initDialog(row) {
+  // dataFormRef.value!.clearValidate()
+  formData.value.orderId = row.orderId
+  formData.value.sampleId = row.sampleId
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      // ElMessageBox.confirm(
+      //   '确认终止吗？',
+      //   '提示',
+      //   { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      // ).then(() => {
+      btnLoading.value = true
+      interchangeListTerminate(formData.value).then((res) => {
+        ElMessage.success('操作成功')
+        btnLoading.value = false
+        dialogVisible.value = false
+        emit('onSuccess')
+      }).catch((_) => {
+        btnLoading.value = false
+      })
+      // })
+    }
+  })
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="终止"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="top"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="请输入终止原因" prop="reason">
+            <el-input
+              v-model="formData.reason"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm(dataFormRef)">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/buttonBox.vue b/src/views/business/schedule/interchange/buttonBox.vue
deleted file mode 100644
index dc864bd..0000000
--- a/src/views/business/schedule/interchange/buttonBox.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script lang="ts" setup name="ButtonBox">
-import { DefaultProps } from 'element-plus'
-import { ref } from 'vue'
-const emits = defineEmits(['changeCurrentButton'])
-// 按钮菜单
-const menu = [
-  { name: '待收入', id: 'taking' },
-  { name: '已收入', id: 'took' },
-  { name: '待归还', id: 'returning' },
-  { name: '已归还', id: 'returned' },
-  { name: '已超期', id: 'overtime' },
-]
-const current = ref('taking')
-watch(current, (newValue) => {
-  emits('changeCurrentButton', newValue)
-})
-</script>
-
-<template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.id" :label="item.id">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 76px;
-    right: 15px;
-    z-index: 999;
-  }
-}
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
deleted file mode 100644
index 27687fc..0000000
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ /dev/null
@@ -1,715 +0,0 @@
-<!-- 新建、编辑、详情 -->
-<script lang="ts" setup name="InterchangeEdit">
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
-import { ref } from 'vue'
-import { Search } from '@element-plus/icons-vue'
-import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
-import sampleDialog from '@/views/customer/sample/list/selectCustomer.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
-import countries from '@/components/AddressSelect/country-code.json'
-import { UploadFile } from '@/api/measure/file'
-import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
-
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const pageType = ref('add') // 页面类型: add, edit, detail
-const countryList = ref(countries) // 国家列表
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
-const mesureCategoryMap: { [key: string]: string } = {
-  edit: '编辑',
-  add: '新建',
-  detail: '详情',
-}// 字典
-const mesureCategoryList = [
-  {
-    label: '检定',
-    value: 'jd',
-  },
-  {
-    label: '检测',
-    value: 'jc',
-  },
-  {
-    label: '验收检定',
-    value: 'ysjd',
-  },
-  {
-    label: '抽检',
-    value: 'cj',
-  },
-  {
-    label: '校准',
-    value: 'jz',
-  },
-  {
-    label: '测试',
-    value: 'cs',
-  },
-  {
-    label: '验收校准',
-    value: 'ysjz',
-  },
-]// 校检类别
-const mesureResultList = [
-  {
-    label: '合格',
-    value: 'hg',
-  },
-  {
-    label: '修后合格',
-    value: 'xhhg',
-  },
-  {
-    label: '限用',
-    value: 'xy',
-  },
-  {
-    label: '准用',
-    value: 'zy',
-  },
-  {
-    label: '不合格',
-    value: 'bhg',
-  },
-  {
-    label: '漏检',
-    value: 'lj',
-  },
-  {
-    label: '逾期未检定',
-    value: 'yqwjd',
-  },
-]// 检定结果
-const mesureResultMap = {
-  hg: '合格',
-  xhhg: '修后合格',
-  xy: '限用',
-  zy: '准用',
-  bhg: '不合格',
-  lj: '漏检',
-  yqwjd: '逾期未检定',
-}// 检定结果字典
-const measureTypeList = [
-  {
-    label: '自检',
-    value: '1',
-  },
-  {
-    label: '外包',
-    value: '2',
-  },
-  {
-    label: '外检',
-    value: '3',
-  },
-]// 检定方式
-const dataForm: Ref<ISampleDetail> = ref({
-  id: '',
-  sampleNo: '', // 样品编号
-  sampleName: '', // 样品名称
-  sampleModel: '', // 样品型号
-  manufacturingNo: '', // 出厂编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  phone: '', // 委托方电话
-  postalCode: '', // 委托方邮编
-  companyAddress: '', // 委托方地址
-  mesureCategory: '', // 检校类别
-  manufacturer: '', // 生产厂家
-  manufacturerCountry: '', // 厂家国别
-  manufacturingDate: '', // 出厂年月
-  ABC: '', // ABC
-  // deliverer: '', // 送检人
-  // delivererTel: '', // 送检人联系方式
-  mesureContent: '', // 检定项目
-  mesurePeriod: '', // 检定周期
-  remark: '', // 备注
-  minioFileName: '', // 说明书
-  labelBind: '', // 标签绑定
-  mesureType: '', // 检定方式
-})
-const ruleFormRef = ref<FormInstance>()
-
-// 自定义校验规则--检定周期为正整数
-const validateMesurePeriod = (rule: any, value: any, callback: any) => {
-  if (value === '') {
-    callback()
-  }
-  else if (!(/(^[1-9]\d*$)/.test(value))) {
-    callback(new Error('请输入一个正整数'))
-  }
-  else {
-    callback()
-  }
-}
-
-// 校验规则
-const rules = reactive<FormRules>({
-  sampleName: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }],
-  sampleModel: [{ required: true, message: '样品型号不能为空', trigger: 'blur' }],
-  manufacturingNo: [{ required: true, message: '出厂编号不能为空', trigger: 'blur' }],
-  customerNo: [{ required: true, message: '委托方代码不能为空', trigger: 'change' }],
-  customerName: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
-  phone: [{ required: true, message: '委托方电话不能为空', trigger: 'blur' }],
-  postalCode: [{ required: true, message: '委托方邮编不能为空', trigger: 'blur' }],
-  companyAddress: [{ required: true, message: '委托方地址不能为空', trigger: 'blur' }],
-  mesureContent: [{ required: true, message: '检定项目不能为空', trigger: 'blur' }],
-  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
-}) // 表单验证规则
-
-// 其他关联数据列表
-const dataList = ref({
-  measureRecords: [] as SimpleMeasureRecord[],
-  certificationRecords: [] as SimpleCertification[],
-})
-
-// 获取检定记录
-const fetchMeasureRecords = function (query = null) {
-  dataList.value.measureRecords = []
-}
-// 获取检定证书
-const fetchCertifications = function (query = null) {
-  dataList.value.certificationRecords = []
-}
-
-// 菜单
-const menu: Menu[] = [
-  {
-    name: '检定记录',
-    columns: [
-      { text: '委托单编号', value: 'orderCode' },
-      { text: '委托单日期', value: 'orderTime' },
-      { text: '委托方代码', value: 'customerCode' },
-      { text: '委托方名称', value: 'customerName' },
-      { text: '送检人', value: 'deliverer' },
-      { text: '送检日期', value: 'deliverTime' },
-    ],
-    list: 'measureRecords',
-    pagination: true,
-    searchFunc: fetchMeasureRecords,
-  },
-  {
-    name: '检定证书',
-    columns: [
-      { text: '证书编号', value: 'certificationCode' },
-      { text: '证书名称', value: 'certificationName' },
-      { text: '证书类型', value: 'certificationType' },
-      { text: '证书出具日期', value: 'effectiveDate' },
-      { text: '证书有效期', value: 'expirationDate' },
-    ],
-    list: 'certificationRecords',
-    pagination: true,
-    searchFunc: fetchCertifications,
-  },
-]
-
-const currentMenu = ref('检定记录')
-const currentMenuObj = computed(() => {
-  return menu.find(item => item.name === currentMenu.value)
-})
-
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-
-// 打印表单
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '样品详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        dataForm.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-
-// 委托方代码获取焦点
-const customerNoFocus = () => {
-  visible.value = true
-}
-
-// 选好委托方
-const confirmCheckout = (val: Array<ICustomer>) => {
-  if (val && val.length) {
-    const getValue = val[0]
-    dataForm.value.customerNo = getValue.customerNo
-    dataForm.value.customerName = getValue.customerName
-    dataForm.value.phone = getValue.phone
-    dataForm.value.postalCode = getValue.postalCode
-    dataForm.value.companyAddress = getValue.briefName
-  }
-}
-
-// 控制选择委托方对话框显隐
-const changeVisible = (val: boolean) => {
-  visible.value = val
-}
-
-// 保存
-function saveForm(formEl: FormInstance | undefined) {
-  if (!formEl) { return }
-  formEl.validate((valid, fields) => {
-    if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then(() => {
-        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)
-            }
-          })
-        }
-      })
-    }
-  })
-}
-
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
-// 获取详情
-const getInfo = () => {
-  getSapmleDetail({ id: infoId.value }).then((res) => {
-    res.data = {
-      ABC: 'A',
-      companyAddress: '北京/北京市',
-      customerName: '京东集团',
-      customerNo: 'sygf202211290001',
-      id: '',
-      labelBind: '11222',
-      manufacturer: '北京某厂家',
-      manufacturerCountry: 'CN',
-      manufacturingDate: '2023-03',
-      manufacturingNo: '123121',
-      mesureCategory: 'jd',
-      mesureContent: '项目1',
-      mesurePeriod: '1',
-      mesureType: 'zj',
-      minioFileName: '小程序工期表-1117_1674961769128.xlsx',
-      phone: '950618',
-      postalCode: 'test',
-      remark: '无备注',
-      sampleModel: '型号1',
-      sampleName: '样品1',
-      sampleNo: '',
-      measureResultCode: 'bhg',
-    }
-    // dataForm.value = res.data
-    // dataForm.value.measureResult = mesureResultMap[dataForm.value.measureResultCode]
-    // for (const item of menu) {
-    //   item.searchFunc()
-    // }
-  })
-}
-
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`样品-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <div id="form">
-        <el-form
-          ref="ruleFormRef"
-          :model="dataForm"
-          :label-width="120"
-          label-position="right"
-          :rules="rules"
-        >
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="样品编号:" prop="sampleNo">
-                <el-input
-                  v-model="dataForm.sampleNo"
-                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="样品名称:" prop="sampleName">
-                <el-input
-                  v-model="dataForm.sampleName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col><el-col :span="6">
-              <el-form-item label="样品型号:" prop="sampleModel">
-                <el-input
-                  v-model="dataForm.sampleModel"
-                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂编号:" prop="manufacturingNo">
-                <el-input
-                  v-model="dataForm.manufacturingNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方代码" prop="customerNo">
-                <el-input
-                  v-model="dataForm.customerNo"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                  @focus="customerNoFocus"
-                >
-                  <template #suffix>
-                    <el-icon v-if="pageType !== 'detail'" class="el-input__icon">
-                      <search />
-                    </el-icon>
-                  </template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方名称" prop="customerName">
-                <el-input
-                  v-model="dataForm.customerName"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方电话" prop="phone">
-                <el-input
-                  v-model="dataForm.phone"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="委托方邮编" prop="postalCode">
-                <el-input
-                  v-model="dataForm.postalCode"
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="18">
-              <el-form-item label="委托方地址:" prop="companyAddress">
-                <el-input
-                  v-model="dataForm.companyAddress"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="校检类别:">
-                <el-select
-                  v-model="dataForm.mesureCategory"
-                  :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="生产厂家:">
-                <el-input
-                  v-model="dataForm.manufacturer"
-                  :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.manufacturerCountry"
-                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="出厂年月:">
-                <el-date-picker
-                  v-model="dataForm.manufacturingDate"
-                  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="ABC:">
-                <el-select
-                  v-model="dataForm.ABC"
-                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="检定周期（月）:" prop="mesurePeriod">
-                <el-input
-                  v-model="dataForm.mesurePeriod"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定日期:">
-                <el-input
-                  v-model="dataForm.measureDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="有效日期:">
-                <el-input
-                  v-model="dataForm.effectiveDate"
-                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="检定结果:">
-                <el-input
-                  v-model="dataForm.measureResult"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定结果'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="送检人:">
-                <el-input
-                  v-model="dataForm.deliverer"
-                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
-              <el-form-item label="联系方式:">
-                <el-input
-                  v-model="dataForm.delivererTel"
-                  :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"
-                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
-                  :disabled="pageType === 'detail'"
-                  class="full-width-input"
-                >
-                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="标签绑定:">
-                <el-input
-                  v-model="dataForm.labelBind"
-                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="检定项目:" prop="mesureContent">
-                <el-input
-                  v-model="dataForm.mesureContent"
-                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="备注:">
-                <el-input
-                  v-model="dataForm.remark"
-                  type="textarea"
-                  autosize
-                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24" class="marg">
-            <el-col :span="12">
-              <el-form-item label="说明书:">
-                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
-                <span v-else-if="pageType === 'detail'">无</span>
-                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
-                </el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </detail-page>
-
-    <!-- 检定记录、检定证书 -->
-    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
-      <template #menu>
-        <el-radio-group v-model="currentMenu">
-          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-            {{ item.name }}
-          </el-radio-button>
-        </el-radio-group>
-      </template>
-      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
-    </detail-block-switch>
-
-    <!-- 选择委托方组件 -->
-    <sample-dialog v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
-  </app-container>
-</template>
-
-<style lang="scss" scoped>
-// 样式
-</style>
-
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 6e5c9b9..6b3eb34 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -1,88 +1,74 @@
+<!-- 设备收发列表 -->
 <script lang="ts" setup name="InterchangeList">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IListQuery, IinterchangeList } from './interchange_interface'
-import ButtonBox from './buttonBox.vue'
+import teminateDialog from '../components/terminateDialog.vue'
+import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import {
   exportInterchangeList,
   getInterChangeList,
-  interchangeListBack,
-  interchangeListComplete,
-  interchangeListDelete,
-  interchangeListReturn,
-  interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
+  interchangeStatusChange,
 } from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import buttonBox from '@/components/buttonBox/buttonBox.vue'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
-
-// 是否加急
-const isUrgentMap = [
-  { label: '全部', value: '0' },
-  { label: '是', value: '1' },
-  { label: '否', value: '2' },
-]
-
-// 样品属性
-const sampleAttrMap = [
-  { label: '全部', value: '0' },
-  { label: '客户样品', value: '1' },
-  { label: '自有设备', value: '2' },
-]
-
-const currentMenu = ref('taking') // buttonBox菜单选中项
+const menu = ref<IMenu[]>([]) // 右上角菜单
+const currentMenu = ref('') // 选中的按钮
+const active = ref('') // 选中的按钮的code
+const terminateRef = ref() // 确认终止dialog
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   customerId: '', // 委托方代码
   startTime: '', // 预计送达开始时间
   endTime: '', // 预计送达结束时间
   isUrgent: '', // 是否加急
-  sampleAttr: '', // 样品属性
-  type: '',
+  sampleBelong: '', // 样品属性
+  sampleStatus: '', // 样品状态
   offset: 1,
   limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
-
 // 表头待收入
 const columnsTaking = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
-
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '实际送达时间', value: 'deliverTime', align: 'center' },
+  { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
-  { text: '样品属性', value: 'sampleAttr', align: 'center' },
-  { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
+  { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
+  { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
 ])
 
@@ -94,66 +80,86 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
+const isUrgentMap = ref<dictType[]>([]) // 是否加急
+const sampleAttrMap = ref<dictType[]>([]) // 样品属性
+const sampleStatusMap = ref<dictType[]>([]) // 样品状态
+
+// 获取字典值
+async function getDict() {
+  // 是否加急
+  getDictByCode('isUrgent').then((response) => {
+    isUrgentMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value,
+      }
+    })
+    // 在已有的字典的基础上增加一个全部0进去
+    isUrgentMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2', // 是否加急全部后端定为2
+    })
+  })
+  // 样品属性
+  getDictByCode('sampleBelong').then((response) => {
+    sampleAttrMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: item.value, // 后端需要int型，在此转换
+      }
+    })
+    // 在已有的字典的基础上增加一个全部进去
+    sampleAttrMap.value.unshift({
+      id: '',
+      name: '全部',
+      value: '2',
+    })
+  })
+  // 样品状态
+  const res = await getDictByCode('sampleStatus')
+  sampleStatusMap.value = res.data.map((item: dictType) => {
+    return {
+      ...item,
+      value: parseInt(item.value as string), // 后端需要int型，在此转换
+    }
+  })
+  // 制作右上角的菜单
+  sampleStatusMap.value.forEach((item: dictType) => {
+    if (item.name === '待收入' || item.name === '待归还'
+      || item.name === '已归还' || item.name === '已超期') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+  menu.value.splice(1, 0, {
+    name: '已收入',
+    id: '2', // 后端规定已收入传2
+  })
+}
+
 // 数据查询
 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 || ''
-  listQuery.value.type = currentMenu.value
-  // getInterChangeList(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', // 预计送达时间
-  //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: 'test',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      orderCode: 'test', // 委托书编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      deliverer: 'test', // 送检人
-      isUrgent: '1', // 是否加急
-      sampleAttr: '1', // 样品属性
-      planDeliverTime: 'test', // 预计送达时间
-      deliverTime: 'test', // 实际送达时间
-      requireOverTime: 'test', // 要求检完时间
-      currentCertifications: '1', // 已出具证书总数
-      requireCertifications: '5', // 应出具证书总数
-      currentDeliver: 'test', // 当前检定环节
-    }].map((item: IinterchangeList) => {
-    return {
-      ...item,
-      Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
-    }
+  listQuery.value.sampleStatus = active.value
+  getInterChangeList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IinterchangeList) => {
+      return {
+        ...item,
+        Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
+        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
 }
 
@@ -166,17 +172,18 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
-    orderCode: '', // 委托书编号
+    orderNo: '', // 委托书编号
     customerId: '', // 委托方代码
     startTime: '', // 预计送达开始时间
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
-    sampleAttr: '', // 样品属性
-    type: currentMenu.value,
+    sampleBelong: '', // 样品属性
+    sampleStatus: '',
     offset: 1,
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 多选发生改变时
@@ -195,11 +202,17 @@
   fetchData(true)
 }
 
-// 监听buttonBox切换
+// 按钮切换
 const changeCurrentButton = (val: string) => {
-  currentMenu.value = val
-  console.log(currentMenu.value)
-
+  active.value = val
+  const currentMenuItem = menu.value.find(item => item.id === val)
+  if (val === '2') {
+    currentMenu.value = '已收入'
+  }
+  else {
+    currentMenu.value = currentMenuItem!.name
+  }
+  window.sessionStorage.setItem('interchangeActive', val)
   fetchData(true)
 }
 
@@ -223,13 +236,13 @@
     const params = {
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
-      orderCode: listQuery.value.orderCode, // 委托书编号
+      orderNo: listQuery.value.orderNo, // 委托书编号
       customerId: listQuery.value.customerId, // 委托方代码
       startTime: listQuery.value.startTime, // 预计送达开始时间
       endTime: listQuery.value.endTime, // 预计送达结束时间
       isUrgent: listQuery.value.isUrgent, // 是否加急
-      sampleAttr: listQuery.value.sampleAttr, // 样品属性
-      type: currentMenu.value,
+      sampleBelong: listQuery.value.sampleBelong, // 样品属性
+      sampleStatus: active.value, // 样品状态
       ids: checkoutList.value,
     }
     exportInterchangeList(params).then((res) => {
@@ -256,15 +269,15 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'delete') { // 无需检测
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '7' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -272,7 +285,7 @@
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -280,7 +293,17 @@
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
+        let status
+        if (currentMenu.value === '已收入') {
+          status = '1'
+        }
+        if (currentMenu.value === '待归还') {
+          status = '2'
+        }
+        if (currentMenu.value === '已归还') {
+          status = '5'
+        }
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -288,15 +311,15 @@
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
+        interchangeStatusChange({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '6' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
-      else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
+      else if (type === 'urge') { // 催办 ------------------- 后端未开发完
+        interchangeListUrge({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -304,12 +327,7 @@
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success(`已${title}`)
-            fetchData(true)
-          }
-        })
+        terminateRef.value.initDialog(row)
       }
     })
 }
@@ -317,9 +335,9 @@
 // 打印列表
 function printList() {
   // 打印列
-  let column = columnsTaking.value
-  if (currentMenu.value === 'taking') {
-    column = columns.value
+  let column = columns.value
+  if (currentMenu.value === '待收入') {
+    column = columnsTaking.value
   }
   const properties = column.map((item) => {
     return {
@@ -341,10 +359,19 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
+  $router.push(`/sample/${pageType}/${row.sampleId}`)
 }
 
-fetchData(true)
+onMounted(async () => {
+  await getDict() // 字典
+  if (window.sessionStorage.getItem('interchangeActive')) {
+    active.value = window.sessionStorage.getItem('interchangeActive')!
+  }
+  else {
+    active.value = '1' // 待收入
+  }
+  fetchData(true) // 列表数据
+})
 </script>
 
 <template>
@@ -371,7 +398,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.orderCode"
+          v-model.trim="listQuery.orderNo"
           placeholder="委托书编号"
           class="short-input"
           clearable
@@ -403,17 +430,17 @@
           <el-option
             v-for="item in isUrgentMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.sampleAttr" placeholder="样品属性" style="width: 120px;" clearable>
+        <el-select v-model="listQuery.sampleBelong" placeholder="样品属性" style="width: 120px;" clearable>
           <el-option
             v-for="item in sampleAttrMap"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"
           />
         </el-select>
@@ -421,21 +448,21 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === 'taking'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === 'took' || currentMenu === 'overtime') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === 'returning'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
-        :data="list" :total="total" :columns="currentMenu === 'taking' ? columnsTaking : columns" :query="listQuery"
+        :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="240">
+          <el-table-column label="操作" align="center" fixed="right" width="270">
             <template #default="{ row }">
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === '待收入'"
                 size="small"
                 type="primary"
                 link
@@ -452,7 +479,7 @@
                 详情
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === 'taking' || currentMenu === 'took' || currentMenu === 'returning')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/tagBinding') && (currentMenu === '待收入' || currentMenu === '已收入' || currentMenu === '待归还')"
                 size="small"
                 link
                 type="primary"
@@ -461,7 +488,7 @@
                 标签绑定
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/take') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="primary"
@@ -470,7 +497,7 @@
                 收入
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === 'taking'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/delete') && currentMenu === '待收入'"
                 size="small"
                 link
                 type="danger"
@@ -479,7 +506,7 @@
                 无需检测
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === '已收入'"
                 size="small"
                 link
                 type="primary"
@@ -488,7 +515,7 @@
                 完成
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === 'returning'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/return') && currentMenu === '待归还'"
                 size="small"
                 link
                 type="primary"
@@ -497,7 +524,7 @@
                 归还
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === 'returning' || currentMenu === 'took' || currentMenu === 'returned')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/back') && (currentMenu === '待归还' || currentMenu === '已收入' || currentMenu === '已归还')"
                 size="small"
                 link
                 type="primary"
@@ -506,7 +533,7 @@
                 回退
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === 'overtime'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === '已超期'"
                 size="small"
                 link
                 type="primary"
@@ -515,7 +542,7 @@
                 催办
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/terminate') && (currentMenu === 'took' || currentMenu === 'overtime')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/terminate')"
                 size="small"
                 link
                 type="primary"
@@ -528,7 +555,9 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <!-- 终止弹窗 -->
+    <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts
index a7df4fd..e5140a4 100644
--- a/src/views/business/schedule/interchange/interchange_interface.ts
+++ b/src/views/business/schedule/interchange/interchange_interface.ts
@@ -3,13 +3,13 @@
 export interface IListQuery {
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
-  orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   customerId: string // 委托方代码
   startTime: string // 预计送达开始时间
   endTime: string // 预计送达结束时间
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
-  type: string // 类型（buttonBox）
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 样品状态
   offset: number
   limit: number
 }
@@ -20,23 +20,25 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   customerId: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送检人
   isUrgent: string // 是否加急
-  sampleAttr: string // 样品属性
+  sampleBelong: string // 样品属性
   planDeliverTime: string // 预计送达时间
   deliverTime: string // 实际送达时间
   requireOverTime: string // 要求检完时间
-  currentCertifications: string | number // 已出具证书总数
+  alreadyCertifications: string | number // 已出具证书总数
   requireCertifications: string | number // 应出具证书总数
   currentDeliver: string // 当前检定环节
+  orderId: string | number // 委托书id
+  sampleId: string | number// 样品id
 }
 
 // 检定记录
 export interface SimpleMeasureRecord {
-  orderCode: string // 委托单编号
+  orderNo: string // 委托单编号
   orderTime: string // 委托单日期
   customerCode: string // 委托人代码
   customerName: string // 委托人名称
@@ -93,3 +95,10 @@
   measureResult?: string // 检定结果
 }
 
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 2b57a17..ed11f7e 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,23 +1,36 @@
-<script lang="ts" setup name="CustomerList">
+<script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import type { IReceiptDetail, dictType } from './receiptList-interface'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
+import selectOrder from './selectOrder.vue'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import selectSample from '@/views/business/schedule/order/selectSample.vue'
 import userStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
-import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import BarCodeBind from '@/components/BarCodeBind/index.vue'
+import type { queryType, typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
-const visible = ref(false) // 控制选择委托方对话框显隐
+const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const orderVisible = ref(false) // 控制委托书对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
-
-const ruleFormRef = ref()
+const minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
 // 表单
 const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -28,7 +41,7 @@
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方邮编
+  fax: '', // 委托方传真
   postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
   deliverer: '', // 送检人
@@ -41,9 +54,69 @@
   appearance: '', // 样品外观
   relyFile: '', // 依据文件
 })
+// 表单验证规则
+const rules = reactive<FormRules>({
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
+  certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
+  certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
+  certificationCompanyAddress: [{ required: true, message: '要求证书单位地址不能为空', trigger: 'blur' }],
+  reciever: [{ required: true, message: '要求接收人不能为空', trigger: 'blur' }],
+  recieverPhone: [{ required: true, message: '要求接收人电话/手机不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  fax: [{ required: true, message: '要求委托方传真不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  deliverer: [{ required: true, message: '要求送检人不能为空', trigger: 'blur' }],
+  delivererTel: [{ required: true, message: '要求送检人电话/手机不能为空', trigger: 'blur' }],
+  orderTime: [{ type: 'date', required: true, message: '要求委托日期不能为空', trigger: 'change' }],
+  requireOverTime: [{ type: 'date', required: true, message: '要求完成时间不能为空', trigger: 'change' }],
+  deliverTime: [{ type: 'date', required: true, message: '要求交接时间不能为空', trigger: 'change' }],
+  measureCategory: [{ required: true, message: '要求校检类别不能为空', trigger: 'change' }],
+  secrecy: [{ required: true, message: '要求保密要求不能为空', trigger: 'change' }],
+})
+const list = ref<ISampleList[]>([])// 表格数据-样品
+// 选中的内容
+const checkoutList = ref([])
+// 表头
+const columns = ref([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true },
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号', value: 'sampleModel', align: 'center', required: true },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '附件说明', value: 'appendixDescn', align: 'center' },
+  { text: '外观', value: 'appearance', align: 'center' },
+  { text: '检定要求', value: 'measureRequire', align: 'center' },
+])
+
+// 签章查询数据
+const searchQuerySignature = reactive<queryType>({
+  signNo: 'qmqz202212050009', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '', // 1签名、2签章
+})
+// 签名查询数据
+const searchQueryAutograph = reactive<queryType>({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
 
 // 获取字典值
-function getDict() {
+async function getDict() {
   // 校检类别
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
@@ -77,8 +150,31 @@
   getDictByCode('secrecy').then((response) => {
     secrecyList.value = response.data
   })
+  // 获取类型（签名、签章）
+  const res = await getDictByCode('signType')
+  searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+  searchQueryAutograph.signType = res.data.filter((item: typeofSign) => item.name === '签名')[0].value
+  console.log(res.data.filter((item: typeofSign) => item.name === '签章')[0].value)
+  console.log(searchQuerySignature.signType)
+  console.log(searchQueryAutograph.signType)
 }
-getDict()
+
+// 获取签章数据
+const getSignatureList = () => {
+  listPageApi(searchQuerySignature).then((res) => {
+    if (res.code === 200) {
+      minioFileNameSignature.value = res.data.rows[0].minioFileName
+    }
+  })
+}
+// 获取签名数据
+const getAutographList = () => {
+  listPageApi(searchQueryAutograph).then((res) => {
+    if (res.code === 200) {
+      minioFileNameAutograph.value = res.data.rows[0].minioFileName
+    }
+  })
+}
 
 // 从路由中获取页面类型参数
 const $route = useRoute()
@@ -95,34 +191,148 @@
   $router.back()
 }
 
-// 选好委托方
-const confirmCheckout = (val: Array<ICustomer>) => {
-  // if (val && val.length) {
-  //   list.value = [] // 切换委托方时把样品清单置空
-  //   const getValue = val[0]
-  //   dataForm.value.customerNo = getValue.customerNo // 委托方代码
-  //   dataForm.value.customerId = getValue.id // 委托方id
-  //   dataForm.value.customerName = getValue.customerName // 委托方名称
-  //   dataForm.value.phone = getValue.phone // 委托方电话
-  //   dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
-  // }
-}
-
 // 点击提交
 const submit = () => {}
 
+// ------------------------委托书-----------------------------
 // 点击选择委托书编号
-const selectOrder = () => {
-
+const handleClickOrder = () => {
+  orderVisible.value = true
 }
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托书
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    dataForm.value.orderCode = val[0].orderCode // 委托书编号
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+  }
+}
+
+// ------------------------委托方-----------------------------
+// 点击选择委托方编号
+const handleClickCustomer = () => {
+  customerVisible.value = true
+}
+// 修改委托方对话框显隐
+const changeCustomerVisible = (val: boolean) => {
+  customerVisible.value = val
+}
+// 选好委托方
+const confirmCheckoutCustomer = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    list.value = [] // 切换委托方时把样品清单置空
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.postalCode = getValue.postalCode // 委托方邮编
+    dataForm.value.fax = getValue.fax // 委托方传真
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// ------------------------样品-----------------------------
+// 点击批量增加
+const multiAdd = () => {
+  sampleVisible.value = true
+}
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 选好样品
+const clickConfirmSample = (val: Array<ISampleList>) => {
+  if (val && val.length) {
+    val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+      if (index === -1) {
+        list.value.push({
+          ...item,
+        })
+      }
+    })
+  }
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    const index = list.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index !== -1) {
+      list.value.splice(index, 1)
+    }
+  })
+}
+
+// 点击保存
+const saveForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (pageType.value === 'edit') { // 编辑
+          // updateOrder(params).then(() => {
+          //   ElMessage.success('已保存')
+          //   $router.go(-1)
+          // })
+        }
+        if (pageType.value === 'add') { // 新建
+          // addOrder(params).then(() => {
+          //   ElMessage.success('已保存')
+          //   $router.go(-1)
+          // })
+        }
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+// 接收人表单失去焦点--调用签名管理数据
+const receiverBlur = () => {
+  getAutographList()
+}
+
+onMounted(async () => {
+  if (pageType.value === 'add') {
+    dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+  }
+  await getDict()
+  getSignatureList()
+})
 </script>
 
 <template>
   <app-container>
     <div id="main">
-      <div class="orderNo-title">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
         <span>交接单编号：</span>
-        <span>11111111</span>
+        <span>{{ dataForm.interchangeCode }}</span>
       </div>
       <div class="customer-title">
         <img src="@/assets/images/logo.png" class="img">
@@ -132,9 +342,6 @@
       </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="submit">
-            提交
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
           </el-button>
@@ -148,6 +355,7 @@
             :model="dataForm"
             :label-width="120"
             label-position="right"
+            :rules="rules"
           >
             <el-row :gutter="24">
               <el-col :span="6">
@@ -159,7 +367,7 @@
                     disabled
                   >
                     <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="selectOrder">
+                      <el-button size="small" @click="handleClickOrder">
                         选择
                       </el-button>
                     </template>
@@ -211,8 +419,6 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="接收人:" prop="reciever">
                   <el-input
@@ -220,6 +426,7 @@
                     :placeholder="pageType === 'detail' ? '' : '请输入接收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
+                    @blur="receiverBlur"
                   />
                 </el-form-item>
               </el-col>
@@ -234,6 +441,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
+
             <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="委托方代码:" prop="customerNo">
@@ -244,7 +452,7 @@
                     disabled
                   >
                     <template v-if="pageType !== 'detail'" #append>
-                      <el-button size="small" @click="selectCustomer">
+                      <el-button size="small" @click="handleClickCustomer">
                         选择
                       </el-button>
                     </template>
@@ -295,8 +503,6 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="送检人" prop="deliverer">
                   <el-input
@@ -317,6 +523,8 @@
                   />
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="委托日期:" prop="orderTime">
                   <el-date-picker
@@ -327,7 +535,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
@@ -416,19 +624,19 @@
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="样品清单">
+      <detail-block title="被测样品列表">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            从样品库中添加
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
-            增加行
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
+            批量添加
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
             删除行
           </el-button>
         </template>
-        <!-- <el-table
+        <el-table
           :data="list"
           border
           style="width: 100%;"
@@ -445,33 +653,37 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          >
-            <template #header>
-              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-            </template>
-            <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
-              <el-input
-                v-if="item.value !== 'powerVoltage' && scope.row.isEdit"
-                v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
-                :disabled="item.disabled"
-                class="input"
-              />
-              <span v-if="item.value !== 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-              <el-select v-if="item.value === 'powerVoltage' && scope.row.isEdit" v-model="scope.row[item.value]" :placeholder="`请选择${item.text}`">
-                <el-option
-                  v-for="i in powerVoltageMap"
-                  :key="i.value"
-                  :label="i.name"
-                  :value="i.value"
-                />
-              </el-select>
-              <span v-if="item.value === 'powerVoltage' && !scope.row.isEdit">{{ scope.row[item.value] }}</span>
-            </template>
-          </el-table-column>
-        </el-table> -->
+          />
+        </el-table>
       </detail-block>
+      <!-- 签章部分 -->
+      <div class="receipt-signature">
+        <div class="content">
+          <span class="title">甲方</span>
+          <div class="deliverer-time">
+            <span class="text-title">送检人:</span>
+            <span class="time">时ㅤ间:</span>
+          </div>
+        </div>
+        <div class="content">
+          <span class="title">乙方</span>
 
+          <div class="deliverer-time">
+            <div class="img">
+              <show-photo height="111px" width="183px" :minio-file-name="minioFileNameSignature" />
+            </div>
+            <div class="img-name">
+              <show-photo height="100px" width="200px" :minio-file-name="minioFileNameAutograph" />
+            </div>
+
+            <span class="text-title">接收人:</span>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
       <!-- 公司信息 -->
       <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
@@ -485,13 +697,22 @@
       </div>
     </div>
     <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" /> -->
+    <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
     <!-- 选择样品组件 -->
-    <!-- <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" /> -->
+    <select-sample v-model:visible="sampleVisible" :customer-no="dataForm.customerNo" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
+    <!-- 选择委托书组件 -->
+    <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
+    <!-- 标签绑定 -->
+    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
 <style lang="scss" scoped>
+.orderNo-title {
+  font-size: 13px;
+  color: #606266;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
@@ -529,4 +750,58 @@
     }
   }
 }
+
+.receipt-signature {
+  display: flex;
+  justify-content: space-around;
+  // padding: 50px 250px 50px 150px;
+  padding: 50px;
+  font-size: 28px;
+  color: #000;
+  font-weight: 600;
+
+  .content {
+    display: flex;
+    position: relative;
+
+    .img {
+      position: absolute;
+      right: 0;
+      top: 0;
+      z-index: 2;
+    }
+
+    .img-name {
+      position: absolute;
+      left: 220px;
+      top: -30px;
+      z-index: 1;
+    }
+
+    .title {
+      margin-right: 32px;
+      letter-spacing: 6px;
+    }
+
+    .deliverer-time {
+      display: flex;
+      flex-direction: column;
+
+      .text-title {
+        letter-spacing: 2px;
+      }
+
+      .time {
+        margin-top: 30px;
+        letter-spacing: 2px;
+      }
+
+      .text {
+        font-size: 24px;
+        font-weight: 500;
+        margin-left: 10px;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index d9ed9d3..3decec5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -25,6 +25,7 @@
 
 // 详情表单
 export interface IReceiptDetail {
+  interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
@@ -49,6 +50,18 @@
   relyFile: string // 依据文件
 }
 
+// 样品清单
+export interface ISampleList {
+  id?: string
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  appendixDescn: string // 附件说明
+  appearance: string // 外观
+  measureRequire: string // 检定要求
+}
+
 // 字典
 export interface dictType {
   id: string
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index feb3507..03f3492 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -1,4 +1,5 @@
-<script lang="ts" setup name="CustomerList">
+<!-- 设备交接单列表 -->
+<script lang="ts" setup name="ReceiptList">
 import type { DateModelType } from 'element-plus'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
@@ -6,6 +7,7 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -23,12 +25,12 @@
 })
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center' },
+  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '接收人', value: 'reciever', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center' },
+  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
@@ -43,30 +45,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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1111',
-      interchangeCode: '1111', // 交接单编号
-      customerNo: '1111', // 委托方代码
-      customerName: '1111', // 委托方名称
-      reciever: '1111', // 接收人
-      deliverer: '1111', // 送样人
-      deliverTime: '1111', // 交接时间
-      remark: '1111', // 备注
-    },
-  ]
+  getReceiptList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 点击编辑/详情
@@ -81,13 +71,17 @@
 
 // 点击取消
 const handleCancle = (id: string) => {
-
+  deleteReceiptList({ id }).then(() => {
+    ElMessage.success('已取消')
+    fetchData(true)
+  })
 }
 
 // 点击搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -130,18 +124,21 @@
   })
   if (list.value.length > 0) {
     const params = {
-      orderCode: '', // 委托书编号
+      interchangeCode: '', // 交接单编号
       customerNo: '', // 委托方代码
       customerName: '', // 委托方名称
+      reciever: '', // 接收人
       deliverer: '', // 送样人
-      isUrgent: 2, // 是否加急
-      status: 0, // 接收状态
+      startTime: '', // 交接开始时间
+      endTime: '', // 交接结束时间
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
-    // exportReceiptListList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '委托书列表.xlsx')
-    // })
+    exportReceiptList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备交接单列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
new file mode 100644
index 0000000..63c364f
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -0,0 +1,236 @@
+<!-- 选择委托书dialog -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { IListQuery, IOrderList, dictType } from '@/views/business/schedule/order/orderList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrderList } from '@/api/business/schedule/order'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const isUrgentMap = ref<dictType[]>([]) // 是否加急
+const statusMap = ref<dictType[]>([]) // 接收状态
+
+// 获取字典值
+function getDict() {
+  // 是否加急
+  getDictByCode('isUrgent').then((response) => {
+    isUrgentMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: parseInt(item.value as string),
+      }
+    })
+    // 在已有的字典的基础上增加一个全部0进去
+    isUrgentMap.value.push({
+      id: '',
+      name: '全部',
+      value: 2, // 是否加急全部后端定为2
+    })
+  })
+  // 接收状态
+  getDictByCode('orderStatus').then((response) => {
+    statusMap.value = response.data.map((item: dictType) => {
+      return {
+        ...item,
+        value: parseInt(item.value as string), // 后端需要int型，在此转换
+      }
+    })
+    // 在已有的字典的基础上增加一个全部0进去
+    statusMap.value.push({
+      id: '',
+      name: '全部',
+      value: 0,
+    })
+    console.log(statusMap.value)
+  })
+}
+getDict()
+
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  orderCode: '', // 委托书编号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  deliverer: '', // 送样人
+  isUrgent: 2, // 是否加急 2全部 1是 0否
+  status: 0, // 接收状态
+  offset: 1,
+  limit: 20,
+})
+
+const columns = ref<TableColumn[]>([
+  { text: '委托书编号', value: 'orderCode', align: 'center', width: '160px', fixed: true },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系方式', value: 'customerPhone', align: 'center' },
+  { text: '样品数量', value: 'sampleCount', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IOrderList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getOrderList(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
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    orderCode: '', // 委托书编号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    deliverer: '', // 送样人
+    isUrgent: 2, // 是否加急
+    status: 0, // 接收状态
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmOrder = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div>
+    <el-dialog v-model="visible" title="选择委托书" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.orderCode"
+            placeholder="委托书编号"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.customerNo"
+            placeholder="委托方代码"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.deliverer"
+            placeholder="送样人"
+            class="short-input"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
+            <el-option
+              v-for="item in isUrgentMap"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
+            <el-option
+              v-for="item in statusMap"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      />
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmOrder">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 043fb70..8b924de 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -182,6 +182,8 @@
       deliverer: '', // 送样人
       isUrgent: 2, // 是否加急
       status: 0, // 接收状态
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     exportOrderList(params).then((res) => {
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index cc24992..7a8ec16 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -24,6 +24,8 @@
   status: number // 接收状态
   createTime: string // 创建时间
   remark: string // 备注
+  orderTime: string // 委托日期
+  requireOverTime: string // 要求检完时间
 }
 
 // 详情表单