diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 93eec9d..16e45d1 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -119,7 +119,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 93eec9d..16e45d1 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -119,7 +119,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 991b0bd..1754712 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -888,18 +888,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -911,7 +915,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 93eec9d..16e45d1 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -119,7 +119,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 991b0bd..1754712 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -888,18 +888,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -911,7 +915,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 0dce98a..e280565 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -81,7 +81,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 93eec9d..16e45d1 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -119,7 +119,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 991b0bd..1754712 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -888,18 +888,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -911,7 +915,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 0dce98a..e280565 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -81,7 +81,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 9ff1fd8..25c2ad8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -761,18 +761,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -784,7 +788,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 93eec9d..16e45d1 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -119,7 +119,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 991b0bd..1754712 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -888,18 +888,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -911,7 +915,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 0dce98a..e280565 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -81,7 +81,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 9ff1fd8..25c2ad8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -761,18 +761,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -784,7 +788,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 38f934e..6b6bde8 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -15,6 +15,7 @@
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -30,6 +31,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const userList = ref<any[]>([]) // 人员列表
 const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
@@ -59,6 +61,9 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })// 表单
 const ruleFormRef = ref<FormInstance>()
 
@@ -87,6 +92,7 @@
   // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
   // measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  // busPersonId: [{ required: true, message: '业务员必填', trigger: 'change' }],
   // powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
@@ -114,6 +120,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 
@@ -359,7 +369,13 @@
   }
 }
 // ----------------------------------------------------------------------------------
-
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
 // 非添加页面获取详情
 if (pageType.value !== 'add') {
   getInfo()
@@ -628,6 +644,20 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:" prop="busPersonId">
+                <el-select
+                  v-model="dataForm.busPersonId"
+                  placeholder="请选择业务员"
+                  class="full-width-input"
+                  :disabled="pageType === 'detail'"
+                  filterable
+                  @change="changeBusPersonId"
+                >
+                  <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 93eec9d..16e45d1 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -119,7 +119,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 991b0bd..1754712 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -888,18 +888,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -911,7 +915,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 0dce98a..e280565 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -81,7 +81,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 9ff1fd8..25c2ad8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -761,18 +761,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -784,7 +788,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 38f934e..6b6bde8 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -15,6 +15,7 @@
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -30,6 +31,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const userList = ref<any[]>([]) // 人员列表
 const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
@@ -59,6 +61,9 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })// 表单
 const ruleFormRef = ref<FormInstance>()
 
@@ -87,6 +92,7 @@
   // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
   // measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  // busPersonId: [{ required: true, message: '业务员必填', trigger: 'change' }],
   // powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
@@ -114,6 +120,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 
@@ -359,7 +369,13 @@
   }
 }
 // ----------------------------------------------------------------------------------
-
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
 // 非添加页面获取详情
 if (pageType.value !== 'add') {
   getInfo()
@@ -628,6 +644,20 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:" prop="busPersonId">
+                <el-select
+                  v-model="dataForm.busPersonId"
+                  placeholder="请选择业务员"
+                  class="full-width-input"
+                  :disabled="pageType === 'detail'"
+                  filterable
+                  @change="changeBusPersonId"
+                >
+                  <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index fce43f4..22f9aee 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -58,6 +58,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 93eec9d..16e45d1 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -119,7 +119,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 991b0bd..1754712 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -888,18 +888,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -911,7 +915,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 0dce98a..e280565 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -81,7 +81,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 9ff1fd8..25c2ad8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -761,18 +761,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -784,7 +788,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 38f934e..6b6bde8 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -15,6 +15,7 @@
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -30,6 +31,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const userList = ref<any[]>([]) // 人员列表
 const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
@@ -59,6 +61,9 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })// 表单
 const ruleFormRef = ref<FormInstance>()
 
@@ -87,6 +92,7 @@
   // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
   // measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  // busPersonId: [{ required: true, message: '业务员必填', trigger: 'change' }],
   // powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
@@ -114,6 +120,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 
@@ -359,7 +369,13 @@
   }
 }
 // ----------------------------------------------------------------------------------
-
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
 // 非添加页面获取详情
 if (pageType.value !== 'add') {
   getInfo()
@@ -628,6 +644,20 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:" prop="busPersonId">
+                <el-select
+                  v-model="dataForm.busPersonId"
+                  placeholder="请选择业务员"
+                  class="full-width-input"
+                  :disabled="pageType === 'detail'"
+                  filterable
+                  @change="changeBusPersonId"
+                >
+                  <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index fce43f4..22f9aee 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -58,6 +58,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 629398f..2687603 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -57,6 +57,9 @@
   measureLastTime?: string // 检定日期
   validDeadline?: string // 有效日期
   powerVoltage: string // 电源电压
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 检定记录

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 93eec9d..16e45d1 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -119,7 +119,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 991b0bd..1754712 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -888,18 +888,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -911,7 +915,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 0dce98a..e280565 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -81,7 +81,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 9ff1fd8..25c2ad8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -761,18 +761,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -784,7 +788,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 38f934e..6b6bde8 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -15,6 +15,7 @@
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -30,6 +31,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const userList = ref<any[]>([]) // 人员列表
 const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
@@ -59,6 +61,9 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })// 表单
 const ruleFormRef = ref<FormInstance>()
 
@@ -87,6 +92,7 @@
   // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
   // measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  // busPersonId: [{ required: true, message: '业务员必填', trigger: 'change' }],
   // powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
@@ -114,6 +120,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 
@@ -359,7 +369,13 @@
   }
 }
 // ----------------------------------------------------------------------------------
-
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
 // 非添加页面获取详情
 if (pageType.value !== 'add') {
   getInfo()
@@ -628,6 +644,20 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:" prop="busPersonId">
+                <el-select
+                  v-model="dataForm.busPersonId"
+                  placeholder="请选择业务员"
+                  class="full-width-input"
+                  :disabled="pageType === 'detail'"
+                  filterable
+                  @change="changeBusPersonId"
+                >
+                  <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index fce43f4..22f9aee 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -58,6 +58,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 629398f..2687603 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -57,6 +57,9 @@
   measureLastTime?: string // 检定日期
   validDeadline?: string // 有效日期
   powerVoltage: string // 电源电压
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 检定记录
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 608d93f..4073116 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -55,6 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+  busPersonName: '', // 业务员
 })
 
 // 获取字典值
@@ -503,6 +504,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:">
+                <el-input
+                  v-model="dataForm.busPersonName"
+                  :placeholder="pageType === 'detail' ? '' : '业务员'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 93eec9d..16e45d1 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -119,7 +119,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 991b0bd..1754712 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -888,18 +888,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -911,7 +915,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 0dce98a..e280565 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -81,7 +81,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 9ff1fd8..25c2ad8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -761,18 +761,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -784,7 +788,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 38f934e..6b6bde8 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -15,6 +15,7 @@
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -30,6 +31,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const userList = ref<any[]>([]) // 人员列表
 const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
@@ -59,6 +61,9 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })// 表单
 const ruleFormRef = ref<FormInstance>()
 
@@ -87,6 +92,7 @@
   // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
   // measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  // busPersonId: [{ required: true, message: '业务员必填', trigger: 'change' }],
   // powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
@@ -114,6 +120,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 
@@ -359,7 +369,13 @@
   }
 }
 // ----------------------------------------------------------------------------------
-
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
 // 非添加页面获取详情
 if (pageType.value !== 'add') {
   getInfo()
@@ -628,6 +644,20 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:" prop="busPersonId">
+                <el-select
+                  v-model="dataForm.busPersonId"
+                  placeholder="请选择业务员"
+                  class="full-width-input"
+                  :disabled="pageType === 'detail'"
+                  filterable
+                  @change="changeBusPersonId"
+                >
+                  <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index fce43f4..22f9aee 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -58,6 +58,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 629398f..2687603 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -57,6 +57,9 @@
   measureLastTime?: string // 检定日期
   validDeadline?: string // 有效日期
   powerVoltage: string // 电源电压
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 检定记录
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 608d93f..4073116 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -55,6 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+  busPersonName: '', // 业务员
 })
 
 // 获取字典值
@@ -503,6 +504,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:">
+                <el-input
+                  v-model="dataForm.busPersonName"
+                  :placeholder="pageType === 'detail' ? '' : '业务员'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 0fa35e3..2e935ec 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -55,6 +55,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   {

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 93eec9d..16e45d1 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -119,7 +119,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 991b0bd..1754712 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -888,18 +888,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -911,7 +915,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 0dce98a..e280565 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -81,7 +81,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 9ff1fd8..25c2ad8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -761,18 +761,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -784,7 +788,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 38f934e..6b6bde8 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -15,6 +15,7 @@
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -30,6 +31,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const userList = ref<any[]>([]) // 人员列表
 const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
@@ -59,6 +61,9 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })// 表单
 const ruleFormRef = ref<FormInstance>()
 
@@ -87,6 +92,7 @@
   // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
   // measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  // busPersonId: [{ required: true, message: '业务员必填', trigger: 'change' }],
   // powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
@@ -114,6 +120,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 
@@ -359,7 +369,13 @@
   }
 }
 // ----------------------------------------------------------------------------------
-
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
 // 非添加页面获取详情
 if (pageType.value !== 'add') {
   getInfo()
@@ -628,6 +644,20 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:" prop="busPersonId">
+                <el-select
+                  v-model="dataForm.busPersonId"
+                  placeholder="请选择业务员"
+                  class="full-width-input"
+                  :disabled="pageType === 'detail'"
+                  filterable
+                  @change="changeBusPersonId"
+                >
+                  <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index fce43f4..22f9aee 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -58,6 +58,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 629398f..2687603 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -57,6 +57,9 @@
   measureLastTime?: string // 检定日期
   validDeadline?: string // 有效日期
   powerVoltage: string // 电源电压
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 检定记录
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 608d93f..4073116 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -55,6 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+  busPersonName: '', // 业务员
 })
 
 // 获取字典值
@@ -503,6 +504,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:">
+                <el-input
+                  v-model="dataForm.busPersonName"
+                  :placeholder="pageType === 'detail' ? '' : '业务员'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 0fa35e3..2e935ec 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -55,6 +55,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   {
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index fb675de..e9785cc 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -53,6 +53,7 @@
   measureLastTime?: string // 检定日期
   validDeadline?: string // 有效日期
   powerVoltage: string // 电源电压
+  busPersonName: string // 业务员
 }
 
 // 检定记录

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 93eec9d..16e45d1 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -119,7 +119,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 991b0bd..1754712 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -888,18 +888,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -911,7 +915,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 0dce98a..e280565 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -81,7 +81,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 9ff1fd8..25c2ad8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -761,18 +761,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -784,7 +788,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 38f934e..6b6bde8 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -15,6 +15,7 @@
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -30,6 +31,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const userList = ref<any[]>([]) // 人员列表
 const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
@@ -59,6 +61,9 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })// 表单
 const ruleFormRef = ref<FormInstance>()
 
@@ -87,6 +92,7 @@
   // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
   // measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  // busPersonId: [{ required: true, message: '业务员必填', trigger: 'change' }],
   // powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
@@ -114,6 +120,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 
@@ -359,7 +369,13 @@
   }
 }
 // ----------------------------------------------------------------------------------
-
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
 // 非添加页面获取详情
 if (pageType.value !== 'add') {
   getInfo()
@@ -628,6 +644,20 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:" prop="busPersonId">
+                <el-select
+                  v-model="dataForm.busPersonId"
+                  placeholder="请选择业务员"
+                  class="full-width-input"
+                  :disabled="pageType === 'detail'"
+                  filterable
+                  @change="changeBusPersonId"
+                >
+                  <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index fce43f4..22f9aee 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -58,6 +58,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 629398f..2687603 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -57,6 +57,9 @@
   measureLastTime?: string // 检定日期
   validDeadline?: string // 有效日期
   powerVoltage: string // 电源电压
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 检定记录
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 608d93f..4073116 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -55,6 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+  busPersonName: '', // 业务员
 })
 
 // 获取字典值
@@ -503,6 +504,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:">
+                <el-input
+                  v-model="dataForm.busPersonName"
+                  :placeholder="pageType === 'detail' ? '' : '业务员'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 0fa35e3..2e935ec 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -55,6 +55,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   {
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index fb675de..e9785cc 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -53,6 +53,7 @@
   measureLastTime?: string // 检定日期
   validDeadline?: string // 有效日期
   powerVoltage: string // 电源电压
+  busPersonName: string // 业务员
 }
 
 // 检定记录
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2b03161..0137c1c 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -171,9 +171,12 @@
     fetchData(true)
   }
   else {
+    console.log('ppppp', val)
+
     active.value = val
     activeTitle.value = menu.value.find(item => item.id === val)!.name
     window.sessionStorage.setItem('borrowhandleActive', val)
+    fetchData(true)
     // clearList()
   }
 }

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 93eec9d..16e45d1 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -119,7 +119,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 991b0bd..1754712 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -888,18 +888,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -911,7 +915,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 0dce98a..e280565 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -81,7 +81,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 9ff1fd8..25c2ad8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -761,18 +761,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -784,7 +788,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 38f934e..6b6bde8 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -15,6 +15,7 @@
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -30,6 +31,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const userList = ref<any[]>([]) // 人员列表
 const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
@@ -59,6 +61,9 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })// 表单
 const ruleFormRef = ref<FormInstance>()
 
@@ -87,6 +92,7 @@
   // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
   // measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  // busPersonId: [{ required: true, message: '业务员必填', trigger: 'change' }],
   // powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
@@ -114,6 +120,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 
@@ -359,7 +369,13 @@
   }
 }
 // ----------------------------------------------------------------------------------
-
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
 // 非添加页面获取详情
 if (pageType.value !== 'add') {
   getInfo()
@@ -628,6 +644,20 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:" prop="busPersonId">
+                <el-select
+                  v-model="dataForm.busPersonId"
+                  placeholder="请选择业务员"
+                  class="full-width-input"
+                  :disabled="pageType === 'detail'"
+                  filterable
+                  @change="changeBusPersonId"
+                >
+                  <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index fce43f4..22f9aee 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -58,6 +58,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 629398f..2687603 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -57,6 +57,9 @@
   measureLastTime?: string // 检定日期
   validDeadline?: string // 有效日期
   powerVoltage: string // 电源电压
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 检定记录
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 608d93f..4073116 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -55,6 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+  busPersonName: '', // 业务员
 })
 
 // 获取字典值
@@ -503,6 +504,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:">
+                <el-input
+                  v-model="dataForm.busPersonName"
+                  :placeholder="pageType === 'detail' ? '' : '业务员'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 0fa35e3..2e935ec 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -55,6 +55,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   {
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index fb675de..e9785cc 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -53,6 +53,7 @@
   measureLastTime?: string // 检定日期
   validDeadline?: string // 有效日期
   powerVoltage: string // 电源电压
+  busPersonName: string // 业务员
 }
 
 // 检定记录
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2b03161..0137c1c 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -171,9 +171,12 @@
     fetchData(true)
   }
   else {
+    console.log('ppppp', val)
+
     active.value = val
     activeTitle.value = menu.value.find(item => item.id === val)!.name
     window.sessionStorage.setItem('borrowhandleActive', val)
+    fetchData(true)
     // clearList()
   }
 }
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 3774177..8b83ff3 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -101,6 +101,7 @@
   // }
   // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
   // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  if (!listQuery.value.approvalStatus) { return }
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 93eec9d..16e45d1 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -119,7 +119,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 991b0bd..1754712 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -888,18 +888,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -911,7 +915,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 0dce98a..e280565 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -81,7 +81,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 9ff1fd8..25c2ad8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -761,18 +761,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -784,7 +788,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 38f934e..6b6bde8 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -15,6 +15,7 @@
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -30,6 +31,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const userList = ref<any[]>([]) // 人员列表
 const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
@@ -59,6 +61,9 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })// 表单
 const ruleFormRef = ref<FormInstance>()
 
@@ -87,6 +92,7 @@
   // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
   // measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  // busPersonId: [{ required: true, message: '业务员必填', trigger: 'change' }],
   // powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
@@ -114,6 +120,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 
@@ -359,7 +369,13 @@
   }
 }
 // ----------------------------------------------------------------------------------
-
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
 // 非添加页面获取详情
 if (pageType.value !== 'add') {
   getInfo()
@@ -628,6 +644,20 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:" prop="busPersonId">
+                <el-select
+                  v-model="dataForm.busPersonId"
+                  placeholder="请选择业务员"
+                  class="full-width-input"
+                  :disabled="pageType === 'detail'"
+                  filterable
+                  @change="changeBusPersonId"
+                >
+                  <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index fce43f4..22f9aee 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -58,6 +58,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 629398f..2687603 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -57,6 +57,9 @@
   measureLastTime?: string // 检定日期
   validDeadline?: string // 有效日期
   powerVoltage: string // 电源电压
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 检定记录
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 608d93f..4073116 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -55,6 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+  busPersonName: '', // 业务员
 })
 
 // 获取字典值
@@ -503,6 +504,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:">
+                <el-input
+                  v-model="dataForm.busPersonName"
+                  :placeholder="pageType === 'detail' ? '' : '业务员'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 0fa35e3..2e935ec 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -55,6 +55,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   {
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index fb675de..e9785cc 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -53,6 +53,7 @@
   measureLastTime?: string // 检定日期
   validDeadline?: string // 有效日期
   powerVoltage: string // 电源电压
+  busPersonName: string // 业务员
 }
 
 // 检定记录
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2b03161..0137c1c 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -171,9 +171,12 @@
     fetchData(true)
   }
   else {
+    console.log('ppppp', val)
+
     active.value = val
     activeTitle.value = menu.value.find(item => item.id === val)!.name
     window.sessionStorage.setItem('borrowhandleActive', val)
+    fetchData(true)
     // clearList()
   }
 }
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 3774177..8b83ff3 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -101,6 +101,7 @@
   // }
   // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
   // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  if (!listQuery.value.approvalStatus) { return }
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index 2c5c2ff..dad77d6 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -189,15 +189,19 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="5">
-        <el-form-item label="公司地址:">
-          <address-select :data="companyAddress" detail />
-        </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="公司地址:">
+            <address-select style="width: 100%;" :data="companyAddress" detail />
+          </el-form-item>
+        </el-col>
       </el-row>
-      <el-row :gutter="5">
-        <el-form-item label="开票地址:">
-          <address-select :data="invoiceAddress" detail />
-        </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="开票地址:">
+            <address-select style="width: 100%;" :data="invoiceAddress" detail />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 93eec9d..16e45d1 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -119,7 +119,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 991b0bd..1754712 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -888,18 +888,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -911,7 +915,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 0dce98a..e280565 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -81,7 +81,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 9ff1fd8..25c2ad8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -761,18 +761,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -784,7 +788,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 38f934e..6b6bde8 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -15,6 +15,7 @@
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -30,6 +31,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const userList = ref<any[]>([]) // 人员列表
 const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
@@ -59,6 +61,9 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })// 表单
 const ruleFormRef = ref<FormInstance>()
 
@@ -87,6 +92,7 @@
   // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
   // measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  // busPersonId: [{ required: true, message: '业务员必填', trigger: 'change' }],
   // powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
@@ -114,6 +120,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 
@@ -359,7 +369,13 @@
   }
 }
 // ----------------------------------------------------------------------------------
-
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
 // 非添加页面获取详情
 if (pageType.value !== 'add') {
   getInfo()
@@ -628,6 +644,20 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:" prop="busPersonId">
+                <el-select
+                  v-model="dataForm.busPersonId"
+                  placeholder="请选择业务员"
+                  class="full-width-input"
+                  :disabled="pageType === 'detail'"
+                  filterable
+                  @change="changeBusPersonId"
+                >
+                  <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index fce43f4..22f9aee 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -58,6 +58,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 629398f..2687603 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -57,6 +57,9 @@
   measureLastTime?: string // 检定日期
   validDeadline?: string // 有效日期
   powerVoltage: string // 电源电压
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 检定记录
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 608d93f..4073116 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -55,6 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+  busPersonName: '', // 业务员
 })
 
 // 获取字典值
@@ -503,6 +504,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:">
+                <el-input
+                  v-model="dataForm.busPersonName"
+                  :placeholder="pageType === 'detail' ? '' : '业务员'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 0fa35e3..2e935ec 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -55,6 +55,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   {
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index fb675de..e9785cc 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -53,6 +53,7 @@
   measureLastTime?: string // 检定日期
   validDeadline?: string // 有效日期
   powerVoltage: string // 电源电压
+  busPersonName: string // 业务员
 }
 
 // 检定记录
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2b03161..0137c1c 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -171,9 +171,12 @@
     fetchData(true)
   }
   else {
+    console.log('ppppp', val)
+
     active.value = val
     activeTitle.value = menu.value.find(item => item.id === val)!.name
     window.sessionStorage.setItem('borrowhandleActive', val)
+    fetchData(true)
     // clearList()
   }
 }
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 3774177..8b83ff3 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -101,6 +101,7 @@
   // }
   // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
   // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  if (!listQuery.value.approvalStatus) { return }
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index 2c5c2ff..dad77d6 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -189,15 +189,19 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="5">
-        <el-form-item label="公司地址:">
-          <address-select :data="companyAddress" detail />
-        </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="公司地址:">
+            <address-select style="width: 100%;" :data="companyAddress" detail />
+          </el-form-item>
+        </el-col>
       </el-row>
-      <el-row :gutter="5">
-        <el-form-item label="开票地址:">
-          <address-select :data="invoiceAddress" detail />
-        </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="开票地址:">
+            <address-select style="width: 100%;" :data="invoiceAddress" detail />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 9560cba..187d065 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -355,8 +355,8 @@
           <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
         </search-item>
         <search-item>
-          <address-select :is-show-detailed-address="false" :data="companyAddress" @on-change="companyAddressChange" />
-          <!-- <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable /> -->
+          <!-- <address-select :is-show-detailed-address="false" :data="companyAddress" @on-change="companyAddressChange" /> -->
+          <el-input v-model.trim="listQuery.companyAddress" placeholder="地址" clearable />
         </search-item>
       </search-area>
       <table-container>

diff --git a/src/api/business/schedule/interchangeReceipt.ts b/src/api/business/schedule/interchangeReceipt.ts
index df5e257..45824db 100644
--- a/src/api/business/schedule/interchangeReceipt.ts
+++ b/src/api/business/schedule/interchangeReceipt.ts
@@ -78,3 +78,21 @@
   })
 }
 
+// 删除
+export function delInterchangeReceiptList(data: { id: string }) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 获取流
+export function getStream(data: { id: string }) {
+  return request({
+    url: '/business/interchange/form/export',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
index 1830364..960d7b3 100644
--- a/src/api/business/schedule/order.ts
+++ b/src/api/business/schedule/order.ts
@@ -78,8 +78,8 @@
   })
 }
 
-// 详情
-export function getStream(data: { id: string }) {
+// 获取流
+export function getStream(data: { id: string; excel: boolean }) {
   return request({
     url: `${prefix}/order/form/export`,
     method: 'post',
diff --git a/src/assets/icons/icon-interchange-batch.svg b/src/assets/icons/icon-interchange-batch.svg
new file mode 100644
index 0000000..8228b84
--- /dev/null
+++ b/src/assets/icons/icon-interchange-batch.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719822344104" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3301" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M12.288 389.12h282.624L153.6 184.32z" fill="#3d7eff" p-id="3302"></path><path d="M94.208 737.28l-2.048-348.16h126.976v329.728l323.584-2.048 79.872 122.88H188.416z" fill="#3d7eff" p-id="3303"></path><path d="M974.848 634.88H692.224l141.312 204.8z" fill="#3d7eff" p-id="3304"></path><path d="M892.928 286.72l2.048 348.16h-126.976V305.152l-323.584 2.048-79.872-122.88H798.72z" fill="#3d7eff" p-id="3305"></path></svg>
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.vue b/src/components/AddressSelect/AddressSelect.vue
index 4dd7e64..83c40e8 100644
--- a/src/components/AddressSelect/AddressSelect.vue
+++ b/src/components/AddressSelect/AddressSelect.vue
@@ -149,7 +149,7 @@
 <template>
   <div>
     <!-- 国家 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail"
       v-model="addressObj.country"
       class="address-select"
@@ -165,9 +165,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 省 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.province"
       placeholder="省"
@@ -189,9 +189,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 市 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.city"
       placeholder="市"
@@ -213,9 +213,9 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 区 -->
-    <el-select
+    <!-- <el-select
       v-if="!detail && (addressObj.country === '' || addressObj.country === 'CN')"
       v-model="addressObj.area"
       placeholder="区/县"
@@ -237,12 +237,12 @@
       class="address-select"
       :class="{ 'detail-input': detail }"
       :disabled="detail"
-    />
+    /> -->
     <!-- 详细地址 -->
     <el-input
       v-if="isShowDetailedAddress"
       v-model="addressObj.address"
-      :placeholder="detail ? '' : '详细地址'"
+      :placeholder="detail ? '' : '请输入地址'"
       :disabled="detail"
       class="address-input"
       :class="{ 'detail-input': detail }"
@@ -257,6 +257,6 @@
 }
 
 .address-input {
-  width: 280px;
+  width: 100%;
 }
 </style>
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 37385db..218268c 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -9,7 +9,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import useUserStore from '@/store/modules/user'
 import { fetchApproval } from '@/api/approval'
-import type { deptType, dictType } from '@/global'
+import type { dictType } from '@/global'
 const props = defineProps({
   processId: {
     type: String,
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 22a00f2..f511148 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -328,6 +328,28 @@
         },
       },
       {
+        path: 'measureDataList',
+        name: 'MeasureDataList',
+        component: () => import('@/views/business/lab/measureData/measureDataList.vue'),
+        meta: {
+          title: '计量数据管理',
+          icon: 'ep:key',
+          auth: '/lab/measureData',
+        },
+      },
+      {
+        path: 'measureData/:type/:id?',
+        name: 'MeasureDataDetail',
+        component: () => import('@/views/business/lab/measureData/measureDataDetail.vue'),
+        meta: {
+          title: '计量数据管理详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/measureDataList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/utils/keepQuery.ts b/src/utils/keepQuery.ts
index d4e98f9..c19c1dd 100644
--- a/src/utils/keepQuery.ts
+++ b/src/utils/keepQuery.ts
@@ -16,7 +16,17 @@
   sessionStorage.removeItem(sessionName)
 }
 // 操作
-const needKeep = ['edit', 'detail', 'update', 'add', 'create', 'trainPlanApprove', 'solveDetail', 'certPrintDetail']
+const needKeep = [
+  'edit',
+  'detail',
+  'update',
+  'add',
+  'create',
+  'trainPlanApprove',
+  'solveDetail',
+  'certPrintDetail',
+  'overdueReminderDetail',
+]
 export function keepSearchParams(to: any, sessionName: string, searchQuery: any) {
   if (needKeep.some((item: string) => to.includes(item))) {
     // 保存参数
diff --git a/src/views/business/lab/components/selectOrderSamplesDialog.vue b/src/views/business/lab/components/selectOrderSamplesDialog.vue
new file mode 100644
index 0000000..4002f83
--- /dev/null
+++ b/src/views/business/lab/components/selectOrderSamplesDialog.vue
@@ -0,0 +1,111 @@
+<!-- 选择委托书中的样品 -->
+<script lang="ts" setup name="SelectOrderSamplesDialog">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+import { getOrderDetail } from '@/api/business/schedule/order'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+const orderId = ref('') // 委托书id
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const tableRef = ref()
+const columns = ref<TableColumn[]>([
+  { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', required: true },
+  { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
+  // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
+  { text: '备注', value: 'remark', align: 'center', required: false },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  getOrderDetail({ id: orderId.value }).then((res) => {
+    list.value = res.data.customerSampleInfoList
+    loadingTable.value = false
+  })
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+    tableRef.value.clearMulti()
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  tableRef.value.clearMulti()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = (orderIdParam: string) => {
+  dialogFormVisible.value = true
+  orderId.value = orderIdParam
+  getList()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择样品(样品来源于委托单下的样品清单)" width="65%">
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        ref="tableRef"
+        :data="list"
+        :columns="columns"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="true"
+        :height="300"
+        :pagination="false"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/components/selectSamplesDialog.vue b/src/views/business/lab/components/selectSamplesDialog.vue
new file mode 100644
index 0000000..dee9050
--- /dev/null
+++ b/src/views/business/lab/components/selectSamplesDialog.vue
@@ -0,0 +1,245 @@
+<!-- 选择样品库下的样品 -->
+<script lang="ts" setup name="SelectSampleList">
+import { ElMessage } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/customer/sampleList'
+
+const emits = defineEmits(['confirm'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  startTime: '', // 检定开始时间
+  endTime: '', // 检定结束时间
+  overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+  manufacturer: '', // 生产厂家
+  manufacturingNo: '', // 出厂编号
+  offset: 1,
+  limit: 20,
+})
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const checkoutList = ref([]) // 多选选中的内容
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+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: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
+  {
+    text: '证书过期时间',
+    value: 'validDeadline',
+    align: 'center',
+    width: '180px',
+    styleFilter: (row: any) => { return new Date(row.validDeadline as string).getTime() < new Date().getTime() ? 'color: red' : '' },
+  },
+])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    startTime: '', // 检定开始时间
+    endTime: '', // 检定结束时间
+    overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
+    manufacturer: '', // 生产厂家
+    manufacturingNo: '', // 出厂编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  searchList()
+}
+// 点击确定
+const confirm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择样品')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+// 时间变更
+watch(timeRange, (val) => {
+  if (val) {
+    listQuery.value.startTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.startTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择样品(样品来源于样品库)" width="65%">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="reset"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleNo"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturer"
+          placeholder="生产厂家"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerNo"
+          placeholder="委托方代码"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="上次检定开始时间"
+            end-placeholder="上次检定结束时间"
+          />
+        </search-item>
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        :height="260"
+        :page-sizes="[20]"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 52b2d2a..69f70a0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -100,6 +100,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center', width: '100' },
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
new file mode 100644
index 0000000..8319f65
--- /dev/null
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -0,0 +1,98 @@
+// 查询条件
+export interface IListQuery {
+  approvalStatus: string // 审批状态
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  customerName: string // 委托方名称
+  sampleName: string // 样品名称
+  measureCategory: string // 检校类别
+  approvalStatusName: string // 审批状态名称
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 列表
+export interface IList {
+  id: string // id
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  orderCode: string // 委托书编号
+  customerName: string // 委托方名称
+  measurePersonName: string // 检定员
+  certificateReportFile: string // 证书附件
+  approvalStatus: string // 审批状态
+  calibrationTime: string // 检校日期
+  taskId?: string // 任务id 用于审批
+  decisionItem?: string
+  applyApprovalStatusName?: string // 审批状态名称
+  processId?: string // 流程实例id
+}
+
+// 表单
+export interface IForm {
+  tdysczs: number // 替代已生成证书
+  formId: string
+  yzs: string // 原证书
+  calibrationMajor: string // 检校专业
+  certifications: string // 证书类别
+  certificateReportCode: string // 证书编号
+  certificateReportName: string // 证书名称
+  jdy: string // 检定员
+  jjrq: string // 检校日期
+
+  orderCode: string // 委托书
+  orderId: string // 委托书id
+  customerId?: string // 委托放id
+  customerName: string // 委托方名称
+  certificationCompany: string // 证书单位名称
+  certificationCompanyAddress: string // 证书单位地址
+  calibrationPlace: string // 检校地点
+
+  fjsj: string // 复校时间
+  jssj: string // 接收时间
+  jdjg: string // 检定结果
+  environmentCode: string// 环境记录单编号
+
+  environmentId: string // 环境记录单id
+  temperature: string // 温度
+  humidity: string // 湿度
+  signId: string // 	电子签章id
+  signName: string // 	电子签章名称
+  approvalSignIds: string // 认可标志专用章id
+  approvalSignName: string // 认可标志专用章名称
+  remark: string // 备注
+  ywy: string // 业务员
+  templateId: string // 证书模板
+  templateName: string // 证书模板
+  templateNameFile: string // 证书模板文件
+  certificateReportFile: string // 证书报告附件
+
+  processId?: string // 流程实例id
+}
+
+// 被检样品
+export interface ISampleList {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  manufacturer: string // 生产厂家
+  remark: string // 备注
+}
+
+// 所用的计量标准器具
+export interface IEquipmentList {
+  equipmentNo: string // 设备编号
+  equipmentName: string // 设备名称
+  modelNo: string // 型号
+  manufacturingNo: string // 出厂编号
+  mesureRange: string // 测量范围
+  uncertainty: string // 不确定度
+  syjg: string // 溯源机构
+  zsbh: string // 证书编号
+  validDate: string // 有效日期
+}
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
new file mode 100644
index 0000000..4aa9717
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -0,0 +1,1086 @@
+<!-- 分包申请详情 -->
+<script lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { ref } from 'vue'
+import EnvironmentalDialog from '../components/environmentalDialog.vue'
+import selectSignature from '../components/selectSignature.vue'
+import selectReportTemplate from '../components/selectReportTemplate.vue'
+import SelectOrderSamplesDialog from '../components/selectOrderSamplesDialog.vue'
+import SelectSamplesDialog from '../components/selectSamplesDialog.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { IEquipmentList, IForm, ISampleList } from './measureData-interface'
+import { UploadFile } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { addApply, detail, failUpdateApply, submit, updateApply } from '@/api/business/subpackage/apply'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import { downloadFile } from '@/utils/download'
+import type { dictType } from '@/global'
+const user = useUserStore() // 用户信息
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 关闭页面使用
+const $route = useRoute()
+const query = $route.query
+const approvalDialog = ref() // 审批对话ref
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // 列表id
+const submitId = ref('') // 新建提交时所用的id
+const orderVisible = ref(false) // 控制委托单对话框显隐
+const ruleFormRef = ref<FormInstance>() as any
+const form = ref<IForm>({
+  tdysczs: 0, // 替代已生成证书
+  formId: query.formId as string,
+  yzs: '', // 原证书
+  calibrationMajor: '', // 检校专业
+  certifications: '', // 证书类别
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  jdy: '', // 检定员
+  jjrq: '', // 检校日期
+
+  orderCode: '', // 委托单
+  orderId: '', // 委托单id
+  customerName: '', // 委托方名称
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  calibrationPlace: '', // 检校地点
+
+  fjsj: '', // 复校时间
+  jssj: '', // 接收时间
+  jdjg: '', // 检定结果
+  environmentCode: '', // 环境记录单编号
+  environmentId: '', // 环境记录单id
+  temperature: '', // 温度
+  humidity: '', // 湿度
+  signId: '', // 	电子签章id
+  signName: '', // 	电子签章名称
+  approvalSignIds: '', // 认可标志专用章id
+  approvalSignName: '', // 认可标志专用章名称
+  remark: '', // 备注
+  ywy: '', // 业务员
+  templateId: '', // 证书模板
+  templateName: '', // 证书模板
+  templateNameFile: '', // 证书模板文件
+  certificateReportFile: '', // 证书报告附件
+})
+
+// 校验规则
+const formRules = ref<FormRules>({
+  yzs: [{ required: true, message: '原证书必填', trigger: ['blur', 'change'] }],
+  calibrationMajor: [{ required: true, message: '检校专业必填', trigger: ['blur', 'change'] }],
+  certifications: [{ required: true, message: '证书类别必填', trigger: ['blur', 'change'] }],
+  certificateReportName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }],
+  customerName: [{ required: true, message: '委托方名称必填', trigger: ['blur', 'change'] }],
+  certificationCompany: [{ required: true, message: '证书单位名称必填', trigger: ['blur', 'change'] }],
+  certificationCompanyAddress: [{ required: true, message: '证书单位地址必填', trigger: ['blur', 'change'] }],
+  calibrationPlace: [{ required: true, message: '检校地点必填', trigger: ['blur', 'change'] }],
+  jdy: [{ required: true, message: '检定员必填', trigger: ['blur', 'change'] }],
+  jjrq: [{ required: true, message: '检校日期必填', trigger: ['blur', 'change'] }],
+  fjsj: [{ required: true, message: '复校时间必填', trigger: ['blur', 'change'] }],
+  jssj: [{ required: true, message: '接收时间必填', trigger: ['blur', 'change'] }],
+  jdjg: [{ required: true, message: '检定结果必填', trigger: ['blur', 'change'] }],
+  temperature: [
+    { required: true, message: '温度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  humidity: [{ required: true, message: '相对湿度必填', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
+  ],
+  signName: [{ required: true, message: '电子签章必填', trigger: ['blur', 'change'] }],
+})
+
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  console.log(pageType.value)
+
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// ---------------------------------------字典--------------------------------------------
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+// -------------------------------------原证书--------------------------------------------
+// 点击选择原证书
+const selectOrigin = () => {
+  //
+}
+// ------------------------------------委托单------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    form.value.orderId = val[0].id // 委托单id
+    form.value.orderCode = val[0].orderCode // 委托单
+    form.value.customerId = val[0].customerId// 委托方id
+    form.value.customerName = val[0].customerName// 委托方名称
+    form.value.certificationCompany = val[0].certificationCompany// 证书单位名称
+    form.value.certificationCompanyAddress = val[0].certificationCompanyAddress// 证书单位地址
+  }
+}
+
+// -------------------------------选择环境记录单----------------------------------------
+// 选择环境记录单Ref
+const environmentalDialog = ref()
+// 选择环境记录单
+const environmentalClick = () => {
+  environmentalDialog.value.initDialog()
+}
+// 选择环境记录单表格确认
+const environmentalAdd = (data: any) => {
+  form.value.environmentId = data.id // 环境记录单id
+  form.value.environmentCode = data.environmentCode // 环境记录单编号
+  form.value.temperature = data.temperature // 温度
+  form.value.humidity = data.humidity // 湿度
+}
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
+}
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  form.value.signId = val[0].id // 电子签章id
+  form.value.signName = val[0].signName || '' // 电子签章名称
+}
+
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
+}
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  let ids = '' // id
+  let names = '' // 名字
+  val.forEach((item: any, index: number) => {
+    if (index === 0) {
+      ids = ids + item.id
+      names = names + item.signName
+    }
+    else {
+      ids = `${ids},${item.id}`
+      names = `${names},${item.signName}`
+    }
+  })
+  form.value.approvalSignIds = ids // 认可标志专用章id
+  form.value.approvalSignName = names // 认可标志专用章名称
+}
+
+// -----------------------------------------所依据的技术文件----------------------------------
+// 点击所依据的技术文件
+const selectTechFiles = () => {
+  //
+}
+// --------------------------------------证书模板------------------------------------------
+// 选择证书模板Ref
+const templateDialog = ref()
+// 选择证书模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  form.value.templateId = val.id // 证书报告模板id
+  form.value.templateName = val.templateName || '' // 证书报告模板名称
+  form.value.templateNameFile = val.minioFileName // 证书模板附件
+}
+
+// 点击下载证书模板按钮
+const downloadCertTemplate = () => {
+  if (!form.value.templateId) {
+    ElMessage.warning('请先选择证书模板')
+    return false
+  }
+  if (!form.value.templateNameFile) {
+    ElMessage.warning('选择的证书模板无附件，请检查')
+    return false
+  }
+  downloadFile(form.value.templateNameFile as any, `${form.value.templateName}-${form.value.templateNameFile}`)
+}
+
+// ---------------------------------文件上传（上传证书）-------------------------------------------
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        form.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+        loading.close()
+      }
+      else {
+        ElMessage.error(res.message)
+        loading.close()
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// ----------------------------------------------样品--------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const selectSamplesDialogRef = ref() // 选择样品库中的样品组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const sampleColumns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 选中行
+const handleSelectionSampleChange = (e: any) => {
+  checkoutSampleList.value = e
+}
+
+// 点击批量添加/选择
+const addSample = () => {
+  if (form.value.orderId) {
+    selectOrderSamplesDialogRef.value.initDialog(form.value.orderId)
+  }
+  else {
+    selectSamplesDialogRef.value.initDialog()
+  }
+}
+
+// 选好样品
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  val.forEach((item: ISampleList) => {
+    // 只添加列表里不存在的
+    const index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push(item)
+    }
+  })
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------------------------所用的计量标准器具--------------------------------------------
+const equipmentVisible = ref(false) // 选择设备对话框显隐
+const equipmentList = ref<IEquipmentList[]>([])// 表格数据
+const checkoutEquipmentList = ref<IEquipmentList[]>([])// 多选设备
+// 表头
+const equipmentColumns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '不确定度', value: 'uncertainty', align: 'center' },
+  { text: '溯源机构', value: 'syjg', align: 'center' },
+  { text: '证书编号', value: 'zsbh', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 选中行
+const handleSelectionEquipmentChange = (e: any) => {
+  checkoutEquipmentList.value = e
+}
+
+// 修改测量设备对话框显隐
+const changeEquipmentVisible = (val: boolean) => {
+  equipmentVisible.value = val
+}
+// 点击批量添加/选择
+const addEquipment = () => {
+  equipmentVisible.value = true
+}
+
+// 选中设备
+const confirmSelectEquipment = (val: any) => {
+  val.forEach((item: IEquipmentList) => {
+    // 只添加列表里不存在的
+    const index = equipmentList.value.findIndex((i: IEquipmentList) => item.equipmentNo === i.equipmentNo)
+    if (index === -1) {
+      equipmentList.value.push(item)
+    }
+  })
+}
+
+// 删除计量标准器具
+const delEquipment = () => {
+  if (!checkoutEquipmentList.value.length) {
+    ElMessage.warning('请选中要删除的计量标准器具')
+    return false
+  }
+  checkoutEquipmentList.value.forEach((item: IEquipmentList) => {
+    equipmentList.value.forEach((element, index) => {
+      if (element.equipmentNo === item.equipmentNo) {
+        equipmentList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// -------------------------------------------------------------------------------------------
+
+// 获取详情信息
+const getDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  detail({ id: $route.params.id as string }).then((res) => {
+    loading.close()
+    form.value = res.data
+    form.value.createUserName = res.data.applicantName || user.name
+    list.value = res.data.sampleList.filter((item: ISampleList) => {
+      return item !== null
+    })
+  }).catch(() => {
+    loading.close()
+  })
+}
+
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 保存
+const handleSave = () => {
+  const tempList = list.value.filter(item => item.sampleNo)
+  if (!tempList.length) {
+    ElMessage.warning('样品信息不能为空')
+    return
+  }
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      // 样品&委托单列表（保存/编辑草稿接口入参使用）
+      const temList = [] as any // 临时数组
+      console.log('保存中的数组', list.value)
+
+      list.value.forEach((item: any) => {
+        if ((item.orderId && item.id) || (item.orderId && item.sampleId)) {
+          temList.push({
+            orderId: item.orderId,
+            sampleId: item.id || item.sampleId,
+          })
+        }
+      })
+      form.value.orderSampleList = temList
+      if (pageType.value === 'add') { // 新建
+        addApply(form.value).then((res) => {
+          submitId.value = res.data.id
+          form.value.projectNo = res.data.projectNo // 分包项目编号
+          ElMessage.success('保存成功')
+          loading.close()
+        }).catch(() => {
+          loading.close()
+        })
+      }
+      else if (pageType.value === 'edit') { // 编辑
+        if (query.approvalStatusName === '未通过-驳回') { // 未通过-驳回
+          failUpdateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+        else { // 草稿箱和已取消
+          updateApply(form.value).then((res) => {
+            ElMessage.success('保存成功')
+            loading.close()
+            close()
+          }).catch(() => {
+            loading.close()
+          })
+        }
+      }
+    }
+  })
+}
+
+// 提交
+const handleSubmit = () => {
+  if (submitId.value) {
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const params = {
+      id: submitId.value,
+      formId: query.formId, // 表单id
+    }
+    submit(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存！')
+  }
+}
+
+const sampleVisible = ref(false)
+const projectVisible = ref(false)
+const isMulti = ref(false)
+const selectIndex = ref(0)
+// 点击选择
+const handleSelect = (index: number, row: ISampleList) => {
+  sampleVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+const checkoutList = ref([]) // 选中的行
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
+}
+// 修改项目选择对话框显隐
+const changeProjectVisible = (val: boolean) => {
+  projectVisible.value = val
+}
+
+// 删除行
+const delRow = () => {
+  checkoutList.value.forEach((item: ISampleList) => {
+    list.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        list.value.splice(index, 1)
+      }
+    })
+  })
+}
+
+// ------------------------------------------审批-----------------------------------------
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: form.value.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', query.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', query.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', query.taskId)
+  }
+}
+// ------------------------------------事件-------------------------------------------------
+// 检校专业变化
+const changeCalibrationMajor = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + val + form.value.certifications
+}
+// 证书类别变化
+const changeCertifications = (val: string) => {
+  form.value.certificateReportName = form.value.certificateReportCode + form.value.calibrationMajor + val
+}
+// -------------------------------------------------------------------------------------
+onMounted(async () => {
+  await getDict()
+  form.value.processId = query.processId as string // 流程实例
+  if (pageType.value !== 'add') { // 编辑、详情
+    getDetail()
+    if (query.approvalStatusName !== '草稿箱') {
+      getApprovalRecord(form.value.processId) // 获取审批流程
+    }
+  }
+  else { // 新建
+    // form.value.createUser = user.id // 创建人id
+    // form.value.createUserName = user.name // 创建人
+    // form.value.applicantTime = proxy.dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    form.value.jdy = user.name // 创建人
+    form.value.jjrq = proxy.dayjs().format('YYYY-MM-DD') // 检校日期
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`计量数据管理-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+          上传证书
+        </el-button>
+        <el-button type="primary" :disabled="pageType === 'detail'" @click="downloadCertTemplate">
+          下载证书模板
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '待审批' && query.decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="pageType === 'add'" type="primary" @click="handleSubmit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="handleSave">
+          保存
+        </el-button>
+        <!-- <el-button v-if="pageType === 'detail'" type="primary">
+          打印
+        </el-button> -->
+        <el-button v-if="pageType === 'detail' && query.approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="form"
+        label-position="right"
+        label-width="140"
+        :rules="formRules"
+      >
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="">
+              <el-checkbox v-model="form.tdysczs" :true-label="1" :false-label="0">
+                替代已生成证书
+              </el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.tdysczs" :span="6">
+            <el-form-item label="原证书:" prop="yzs">
+              <el-input
+                v-model="form.yzs"
+                disabled
+                :placeholder="pageType === 'detail' ? '' : '请选择原证书'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="selectOrigin(true)"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="calibrationMajor">
+              <el-select
+                v-model="form.calibrationMajor"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCalibrationMajor"
+              >
+                <el-option
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="certifications">
+              <el-select
+                v-model="form.certifications"
+                clearable
+                size="default"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书类别'"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+                @change="changeCertifications"
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="form.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="form.certificateReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托单:">
+              <el-input
+                v-model.trim="form.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="customerName">
+              <el-input
+                v-model.trim="form.customerName"
+                :placeholder="pageType === 'detail' ? ' ' : '委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书单位名称:" prop="certificationCompany">
+              <el-input
+                v-model.trim="form.certificationCompany"
+                :placeholder="pageType === 'detail' ? ' ' : '请输入证书单位名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+              <el-input
+                v-model="form.certificationCompanyAddress"
+                type="textarea"
+                autosize
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="calibrationPlace">
+              <el-input
+                v-model.trim="form.calibrationPlace"
+                class="full-width-input"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检定员:" prop="jdy">
+              <el-input
+                v-model.trim="form.jdy"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定员'"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校日期:" prop="jjrq">
+              <el-date-picker
+                v-model="form.jjrq"
+                type="date"
+                placeholder="请选择检校日期"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '3'" :span="6">
+            <el-form-item label="复校时间(月):" prop="fjsj">
+              <el-input-number
+                v-model="form.fjsj"
+                :placeholder="pageType === 'detail' ? '' : '请输入复校时间'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                :disabled="pageType === 'detail'"
+                :min="1"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '1'" :span="6">
+            <el-form-item label="接收时间:" prop="jssj">
+              <el-date-picker
+                v-model="form.jssj"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="pageType === 'detail' ? '' : '请选择接收时间'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.certifications === '2'" :span="6">
+            <el-form-item label="检定结果:" prop="jdjg">
+              <el-input
+                v-model.trim="form.jdjg"
+                class="full-width-input"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定结果'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="环境记录单:" prop="environmentCode">
+              <el-input
+                v-model.trim="form.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="environmentalClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="temperature">
+              <el-input
+                v-model.trim="form.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%RH):" prop="humidity">
+              <el-input
+                v-model.trim="form.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%RH)'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所依据的技术文件:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择所依据的技术文件'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="selectTechFiles">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电子签章:" prop="signName">
+              <el-input
+                v-model.trim="form.signName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="认可标志专用章:" prop="approvalSignName">
+              <el-input
+                v-model.trim="form.approvalSignName"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickSpecialSignature">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="form.remark"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                type="textarea"
+                autosize
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员:">
+              <el-input
+                v-model.trim="form.ywy"
+                :placeholder="pageType === 'detail' ? '' : '业务员'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书模板:" prop="templateName">
+              <el-input
+                v-model.trim="form.templateName"
+                :placeholder="pageType === 'detail' ? '' : '请选择证书模板'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button size="small" @click="handleClickTemplate">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书附件:" prop="certificateReportFile">
+              <input v-show="pageType === ''" ref="fileRef" multiple type="file" @change="onFileChange">
+              <span v-if="!form.certificateReportFile">无</span>
+              <div v-else style="display: flex;">
+                <show-photo :minio-file-name="form.certificateReportFile || ''" style="display: inline-block;" />
+              </div>
+              <!-- <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="upload">
+                {{ form.certificateReportFile ? '更换' : '上传' }}
+              </el-button> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="被检样品">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addSample">
+          选择
+        </el-button>
+        <el-button type="info" @click="delSample">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="sampleList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionSampleChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in sampleColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所用的计量标准器具">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addEquipment">
+          选择
+        </el-button>
+        <el-button type="info" @click="delEquipment">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="equipmentList"
+        border
+        style="width: 100%;"
+        max-height="600"
+        @selection-change="handleSelectionEquipmentChange"
+      >
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in equipmentColumns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          :width="item.width"
+          show-overflow-tooltip
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+
+    <detail-block v-if="query.approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 样品增加弹窗 -->
+    <!-- <select-sample v-model:visible="sampleVisible" :is-use-customer-no="false" :is-multi="isMulti" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+    <!-- 选择委托单组件 -->
+    <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+    <!-- 选择环境记录单弹窗 -->
+    <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
+    <!-- 选择签章 -->
+    <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+    <!-- 选择认可标志专用签章 -->
+    <select-signature ref="specialSignatureDialog" :is-multi="true" @add="confirmCheckoutSpecialSignature" />
+    <!-- 选择证书模板 -->
+    <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择样品库下的样品 -->
+    <select-samples-dialog ref="selectSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'warehouse')" />
+    <!-- 选择测量设备 -->
+    <select-measure-device v-model:visible="equipmentVisible" :is-multi="true" @confirm-checkout="confirmSelectEquipment" @change-visible="changeEquipmentVisible" />
+  </app-container>
+</template>
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
new file mode 100644
index 0000000..a1a2364
--- /dev/null
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -0,0 +1,485 @@
+<!-- 计量数据管理列表 -->
+<script lang="ts" setup name="MeasureDataList">
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IList, IListQuery } from './measureData-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { deletePrimitiveLogList, exportPrimitiveLogList, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter() // 初始化路由
+const approvalDialog = ref() // 审批对话ref
+const $route = useRoute()
+const TabActiveButton = 'BusinessLabMeasureData'
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const active = ref('')
+// 查询条件
+const listQuery = ref<IListQuery>({
+  approvalStatus: active.value, // 审批状态
+  certificateReportCode: '', // 证书编号
+  certificateReportName: '', // 证书名称
+  customerName: '', // 委托方名称
+  sampleName: '', // 样品名称
+  measureCategory: '', // 检校类别
+  formId: '',
+  approvalStatusName: '', // 审批状态名称
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 页面跳转之前保存参数
+onBeforeRouteLeave((to: any) => {
+  keepSearchParams(to.path, 'measureDataList', listQuery.value)
+})
+// 重新赋值
+listQuery.value = renewSearchParams('measureDataList') || {
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+}
+// 多选选中
+const checkoutList = ref<string[]>([])
+const list = ref<IList[]>([]) // 数据列表
+const total = ref(0) // 总条数
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'originalRecordCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'originalRecordName', align: 'center' },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '委托单编号', value: 'orderCode', align: 'center' },
+  { text: '委托单名称', value: 'orderName', align: 'center' },
+  { text: '检定员', value: 'measurePersonName', align: 'center' },
+  { text: '证书附件', value: 'measurePersonName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '检校日期', value: 'calibrationTime', align: 'center', width: '120' },
+])
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getPrimitiveLogList(listQuery.value).then((res) => {
+  //   list.value = res.data.rows
+  //   total.value = res.data.total
+  //   loadingTable.value = false
+  // })
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: active.value, // 审批状态
+    certificateReportCode: '', // 证书编号
+    certificateReportName: '', // 证书名称
+    customerName: '', // 委托方名称
+    sampleName: '', // 样品名称
+    measureCategory: '', // 检校类别
+    formId: '',
+    approvalStatusName: '', // 审批状态名称
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  fetchData(true)
+}
+
+// 多选选中
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击新建
+const add = () => {
+  $router.push('/lab/measureData/add')
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '计量数据管理列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter(item => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '计量数据管理列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 操作
+const handleEdit = (row: IList, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // deleteListItem({ id: row.id }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '删除成功',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        // submit({ id: row.id, formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, processId: row.processId }).then((res) => {
+        //   ElMessage({
+        //     type: 'success',
+        //     message: '已提交',
+        //   })
+        //   fetchData(true)
+        // })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId, row.decisionItem)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId, row.decisionItem)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === 'detail' || val === 'edit') { // 详情和编辑
+    $router.push({
+      path: `/lab/measureData/${val}/${row.id}`,
+      query: {
+        formId: listQuery.value.formId,
+        approvalStatusName: row.applyApprovalStatusName, // 审批状态名称
+        decisionItem: `${row.decisionItem}`, // 控制同意、驳回、拒绝按钮
+        processId: row.processId, // 流程实例
+        taskId: row.taskId, // 任务id，用于审批
+      },
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  console.log(val)
+
+  active.value = val
+  window.sessionStorage.setItem(TabActiveButton, val)
+  // clearList()
+  listQuery.value.approvalStatus = active.value
+  fetchData(true)
+}
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem(TabActiveButton)) {
+    active.value = window.sessionStorage.getItem(TabActiveButton)!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportCode"
+          placeholder="证书编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificateReportName"
+          placeholder="证书名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measureCategory"
+          placeholder="检校类别"
+          style="width: 195px;"
+          clearable
+        >
+          <el-option
+            v-for="item in mesureCategoryList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.approvalStatusName"
+          placeholder="审批状态"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <!-- <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        /> -->
+        <icon-button
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </template>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            :width="(active === '0') ? 200 : (active === '1' || active === '6' || active === '3') ? 150 : (active === '4' || active === '5') ? 100 : 200"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批'"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 3"
+                size="small"
+                link
+                type="primary"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if=" row.approvalStatusName === '待审批' && row.decisionItem !== 2"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="row.approvalStatusName === '审批中'"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatusName !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <!-- <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                 @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button> -->
+              <!-- ---------------------------审批中的删除按钮暂时去掉------------------------ -->
+              <el-button
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+      <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index af31676..ce44d4c 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -92,6 +92,7 @@
   { text: '委托书编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: ITaskList) => { return row.isUrgentName == '是' ? 'color: red' : '' } },
   { text: '应检完时间', value: 'requireOverTime', align: 'center', width: '180' },
   { text: '样品属性', value: 'sampleBelongName', align: 'center' },
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index 87f4c00..50e8fd6 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -18,7 +18,6 @@
 ])
 const visible = ref(false) // 对话框显隐
 const list = ref([]) as any // 表格数据
-
 // 点击取消
 const cancle = () => {
   visible.value = false
@@ -51,6 +50,8 @@
       ...item,
       realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
       remark: item.remark || '无',
+      measured: false, // 是否自检
+      backMeasure: false, // 是否退检
     }
   })
   visible.value = true
@@ -129,16 +130,24 @@
               </div>
               <div style="display: flex;">
                 <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-                <span style="color: #000;">{{ item.remark || '无' }}</span>
+                <span class="label-print-remark">{{ item.remark || '无' }}</span>
+              </div>
+              <div style="display: flex;justify-content: space-around;">
+                <el-checkbox v-model="item.measured" disabled>
+                  已检
+                </el-checkbox>
+                <el-checkbox v-model="item.backMeasure" disabled>
+                  退检
+                </el-checkbox>
               </div>
               <img
                 id="barcode"
-                style="width: 200px;margin-left: 44px;margin-top: 8px;"
+                style="width: 200px;margin-left: 44px;"
                 :jsbarcode-value="item.sampleNo"
                 jsbarcode-textmargin="0"
                 jsbarcode-fontoptions="bold"
                 jsbarcode-fontSize="32"
-                :jsbarcode-height="70"
+                :jsbarcode-height="48"
               >
             </div>
           </div>
@@ -168,16 +177,24 @@
             </div>
             <div style="display: flex;">
               <span style="margin-right: 16px;white-space: nowrap;">备ㅤㅤ注</span>
-              <span style="color: #000;">{{ item.remark || '无' }}</span>
+              <span class="label-print-remark">{{ item.remark || '无' }}</span>
+            </div>
+            <div style="display: flex;justify-content: space-around;">
+              <el-checkbox v-model="item.measured">
+                已检
+              </el-checkbox>
+              <el-checkbox v-model="item.backMeasure">
+                退检
+              </el-checkbox>
             </div>
             <img
               id="barcode"
-              style="width: 200px;margin-left: 44px;margin-top: 8px;"
+              style="width: 100px;margin-left: 44px;"
               :jsbarcode-value="item.sampleNo"
               jsbarcode-textmargin="0"
               jsbarcode-fontoptions="bold"
               jsbarcode-fontSize="32"
-              :jsbarcode-height="70"
+              :jsbarcode-height="48"
             >
           </div>
         </div>
@@ -190,10 +207,17 @@
       <!-- <el-button type="primary" @click="printHtml('labelHtml')">
         打印
       </el-button> -->
-
       <el-button @click="cancle">
         取消
       </el-button>
     </template>
   </el-dialog>
 </template>
+
+<style lang="scss" scoped>
+.label-print-remark {
+  color: #000;
+
+  @include text-overflow(1, false);
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 01bcba8..3529644 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -36,6 +36,7 @@
 const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
 const dialogTitle = ref('标签绑定') // 扫描对话框标题
 const labelPrintRef = ref() // 标签打印弹窗
+const normalTableRef = ref()
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -185,6 +186,7 @@
       }
     })
     total.value = parseInt(response.data.total)
+    normalTableRef.value.clearMulti()
     loadingTable.value = false
   })
 }
@@ -451,6 +453,32 @@
   }
   scanSampleRef.value.closeDialog()
 }
+
+// 点击批量收入
+const batchReceive = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'take', '收入')
+}
+// 点击批量检完
+const batchFinish = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'complete', '完成')
+}
+// 点击批量归还
+const batchReturn = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+    return false
+  }
+  handleEdit(checkoutList.value, 'return', '归还')
+}
+
 // -----------------------------------------------------------------------------------
 
 // 打印列表
@@ -584,6 +612,9 @@
     <table-container>
       <template #btns-right>
         <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu === '待收入'" icon="icon-interchange-batch" title="多选收入" type="primary" @click="batchReceive" />
+        <icon-button v-if="currentMenu === '已收入'" icon="icon-interchange-batch" title="多选检完" type="primary" @click="batchFinish" />
+        <icon-button v-if="currentMenu === '待归还'" icon="icon-interchange-batch" title="多选归还" type="primary" @click="batchReturn" />
         <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
@@ -593,7 +624,7 @@
         <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 === '待收入' ? columnsTaking : columns" :query="listQuery"
+        ref="normalTableRef" :data="list" :total="total" :columns="currentMenu === '待收入' ? columnsTaking : columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #preColumns>
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 4612b7c..e3f58bd 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -1,7 +1,7 @@
 <!-- 设备交接单详情 -->
 <script lang="ts" setup name="ReceiptList">
 import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import dayjs from 'dayjs'
 import type { IReceiptDetail, ISampleList, dictType } from './receiptList-interface'
@@ -18,8 +18,10 @@
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import type { userType } from '@/views/system/user/user-interface'
 import { getUserList } from '@/api/system/user'
-import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, getStream, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
 import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+import SelectOrderSamplesDialog from '@/views/business/lab/components/selectOrderSamplesDialog.vue'
+import { exportFile } from '@/utils/exportUtils'
 
 const user = userStore()
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -29,7 +31,7 @@
 const applyPersonLoading = ref(false)
 const customerVisible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
-const orderVisible = ref(false) // 控制委托书对话框显隐
+const orderVisible = ref(false) // 控制委托单对话框显隐
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const secrecyList = ref<dictType[]>([]) // 保密要求
@@ -37,69 +39,30 @@
 const minioFileNameAutograph = ref() // 签名图片
 const ruleFormRef = ref() // 表单ref
 // 表单
-const dataForm: Ref<IReceiptDetail> = ref({
+const dataForm = ref({
   interchangeCode: '', // 交接单编号
-  orderCode: '', // 委托书编号
-  orderNo: '', // 委托书编号
-  orderId: '', // 委托书id
-  certificationCompany: '', // 证书单位名称
-  certificationCompanyFex: '', // 传真
-  certificationCompanyEmail: '', // 邮编
-  reciever: user.name, // 接收人
-  recieverPhone: '', // 接收人电话
-  recieverSignFile: '', // 接收人签名文件
-  certificationCompanyAddress: '', // 证书单位地址
+  orderNo: '', // 委托单编号
+  orderId: '', // 委托单id
   customerNo: '', // 委托方代码
   customerId: '', // 委托方id
   customerName: '', // 委托方名称
-  fax: '', // 委托方传真
-  postalCode: '', // 委托邮编
   customerAddress: '', // 委托方地址
-  deliverer: '', // 送检人
-  delivererTel: '', // 送样人联系方式
-  orderTime: '', // 委托日期
-  requireOverTime: '', // 完成时间
-  deliverTime: '', // 交接时间
-  measureCategory: '', // 检校类别
-  secrecy: '', // 保密要求
-  appearance: '', // 样品外观
-  relyFile: '', // 依据文件
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyAddress: '', // 证书单位地址
+  reciever: '', // 收发员
+  recieverSignFile: '', // 收发员签名文件
+  recieverSignTime: '', // 收发员签名时间
+  signee: '', // 签收人
+  signeeSignFile: '', // 签收人签名文件
+  deliverer: '', // 客户联系人
+  delivererTel: '', // 送电话样人联系方式
 })
 // 表单验证规则
 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' }],
+  orderNo: [{ required: true, message: '要求委托单号必填', trigger: 'blur,change' }],
+  // reciever: [{ required: true, message: '收发员必填', trigger: 'change' }],
+  // signee: [{ 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: 'remark', align: 'center' },
-  { text: '校准/检测项目', value: 'measureContent', align: 'center' },
-])
 
 // 签章查询数据
 const searchQuerySignature = reactive<queryType>({
@@ -129,10 +92,6 @@
 
 // 获取字典值
 async function getDict() {
-  // 校检类别
-  getDictByCode('measureCategory').then((response) => {
-    mesureCategoryList.value = response.data
-  })
   // 系统字典
   getDictByCode('systemDict').then((response) => {
     const tempMap = response.data.map((item: dictType) => {
@@ -158,10 +117,6 @@
     })
     customerInfoMap.value = tempMap
   })
-  // 保密要求
-  getDictByCode('secrecy').then((response) => {
-    secrecyList.value = response.data
-  })
   // 获取类型（签名、签章）
   const res = await getDictByCode('signType')
   searchQuerySignature.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
@@ -185,7 +140,7 @@
     if (res.code === 200) {
       if (res.data.rows.length) {
         minioFileNameAutograph.value = res.data.rows[0].minioFileName
-        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人/收发员签字文件
       }
       else {
         minioFileNameAutograph.value = ''
@@ -210,96 +165,110 @@
   $router.back()
 }
 
-// 点击提交
-const submit = () => {}
-
-// ----------------------------委托书----------------------------------------------------
-// 点击选择委托书编号
-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.orderNo = val[0].orderCode // 委托书编号
-    dataForm.value.orderId = val[0].id // 委托书id
-    dataForm.value.deliverer = val[0].deliverer // 送检人
-    dataForm.value.delivererTel = val[0].delivererTel // 送检人
-    dataForm.value.orderTime = val[0].orderTime // 委托日期
-    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
-    dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].customerId // 委托方id
-    dataForm.value.customerName = val[0].customerName // 委托方名称
-    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
-    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
-    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
-    list.value = []
-  }
-}
-
 // ----------------------------------样品----------------------------------------------
+const selectOrderSamplesDialogRef = ref() // 选择委托书下的样品清单组件ref
+const sampleList = ref<ISampleList[]>([])// 表格数据
+const checkoutSampleList = ref<ISampleList[]>([])// 多选样品列表
+// 表头
+const columns = ref([
+  { text: '样品名称', value: 'sampleName', align: 'center', required: true },
+  { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
+  { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center' },
+  { text: '备注', value: 'interchangeRemark', align: 'center' },
+])
+
 // 点击批量增加
 const multiAdd = () => {
-  if (!dataForm.value.orderCode) {
-    ElMessage.warning('请先选择委托书')
+  if (!dataForm.value.orderId) {
+    ElMessage.warning('请先选择委托单')
     return
   }
-  if (!dataForm.value.customerNo) {
-    ElMessage.warning('没有委托方代码，请检查')
-    return
-  }
-  sampleVisible.value = true
-}
-// 修改委托方对话框显隐
-const changeSampleVisible = (val: boolean) => {
-  sampleVisible.value = val
+  selectOrderSamplesDialogRef.value.initDialog(dataForm.value.orderId)
 }
 // 选好样品
-const clickConfirmSample = (val: Array<ISampleList>) => {
-  if (val && val.length) {
-    val.forEach((item: ISampleList) => {
+const confirmSelectSample = (val: any, type: 'warehouse' | 'order') => {
+  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 index = sampleList.value.findIndex((i: ISampleList) => item.sampleNo === i.sampleNo)
+    if (index === -1) {
+      sampleList.value.push({
+        ...item,
+        appearanceStatus: item.appearanceStatus, //	外观状态
+        interchangeRemark: item.remark, //	备注
+        manufacturingNo: item.manufacturingNo, //	出厂编号/仪器编号
+        orderId: dataForm.value.orderId,	 // 委托书id
+        sampleId: item.id,	 //	样品id
+        sampleModel: item.sampleModel,	//	样品型号
+        sampleName: item.sampleName,	 //	样品名称
+        sampleNo: item.sampleNo,	 //	样品编号
+      })
     }
   })
 }
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutSampleList.value = e
+}
+
+// 删除样品
+const delSample = () => {
+  if (!checkoutSampleList.value.length) {
+    ElMessage.warning('请选中要删除的样品')
+    return false
+  }
+  checkoutSampleList.value.forEach((item: ISampleList) => {
+    sampleList.value.forEach((element, index) => {
+      if (element.sampleNo === item.sampleNo) {
+        sampleList.value.splice(index, 1)
+      }
+    })
+  })
+}
+// ----------------------------委托单----------------------------------------------------
+// 点击选择委托单编号
+const handleClickOrder = () => {
+  orderVisible.value = true
+}
+// 修改委托单对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
+}
+// 选好委托单
+const confirmCheckoutOrder = (val: Array<IOrderList>) => {
+  if (val && val.length) {
+    // 更换委托单需要清空样品列表
+    if (dataForm.value.orderId !== val[0].id) {
+      sampleList.value = []
+    }
+    dataForm.value.orderNo = val[0].orderCode // 委托单编号
+    dataForm.value.orderId = val[0].id // 委托单id
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.deliverer = val[0].deliverer // 客户联系人
+    dataForm.value.delivererTel = val[0].delivererTel // 电话
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+  }
+}
+
+// -------------------------------------------------------------------------------------------------
 // 点击保存
 const saveForm = (formEl: FormInstance | undefined) => {
-  if (!dataForm.value.recieverSignFile) {
+  // if (!dataForm.value.recieverSignFile) {
+  //   ElMessage({
+  //     message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+  //     type: 'warning',
+  //     duration: 5000,
+  //   })
+  //   return
+  // }
+  if (!sampleList.value.length) {
     ElMessage({
-      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
-      type: 'warning',
-      duration: 5000,
-    })
-    return
-  }
-  if (!list.value.length) {
-    ElMessage({
-      message: '被测样品列表不能为空',
+      message: '交接清单不能为空',
       type: 'warning',
       duration: 2000,
     })
@@ -319,45 +288,28 @@
       ).then(() => {
         const params = {
           ...dataForm.value, // 表单
-          customerSampleInfoList: list.value, // 表格
+          customerSampleList: sampleList.value, // 表格
+          recieverSignTime: dayjs().format('YYYY-MM-DD'),
         }
         if (pageType.value === 'edit') { // 编辑
           updateInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then(() => {
             ElMessage.success('已保存')
-            $router.go(-1)
+            pageType.value = 'detail'
           })
         }
-        // 更新委托书的证书单位名称和证书单位地址
-        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
-          let responseData = {} as any
-          responseData = res.data
-          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
-          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
-          updateOrder(responseData) // 更新委托书
-        })
       })
     }
   })
 }
 
-// 点击扫描添加
-const barCodeBind = ref()
-const scanAdd = () => {
-  barCodeBind.value.initDialog('')
-}
-// 扫描完成
-const bindLabelOver = () => {
-  // 逻辑
-}
-
 /**
- * 选好接收人
+ * 选好接收人/收发员
  * @param userId 用户id
  */
 const changeSelectReceiver = (userId: string) => {
@@ -368,16 +320,6 @@
   getAutographList() // 调对应接收人的签名
 }
 
-/**
- * 选好送检人
- * @param userId 用户id
- */
-const changeSelectDeliverer = (userId: string) => {
-  // 在用户列表里找到选择的送检人的名字
-  const name = usePersonList.value.find(item => item.id === userId)!.name
-  dataForm.value.deliverer = name
-}
-
 // 获取用户列表--（是否有不分页接口？）
 const fetchUserList = () => {
   getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
@@ -406,26 +348,29 @@
 const fetchInterchangeReceiptDetail = () => {
   getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data // 表单
-    list.value = res.data.customerSampleList // 样品列表
+    sampleList.value = res.data.customerSampleList // 样品列表
+    dataForm.value.orderId = res.data.customerSampleList[0].orderId // orderId
     minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
   })
 }
 
-// 点击打印
-const printObj = ref({
-  id: 'main', // 需要打印元素的id
-  popTitle: '设备交接单详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value }).then((res) => {
+    exportFile(res.data, '样品交接单.xls')
+    loading.close()
+  })
+}
 
 onMounted(async () => {
   await getDict() // 获取字典
   nextTick(() => {
     if (pageType.value === 'add') {
-      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+      dataForm.value.reciever = user.id // 收发员
     }
     else {
       fetchInterchangeReceiptDetail() // 获取详情信息
@@ -441,20 +386,13 @@
 <template>
   <app-container>
     <div id="main">
-      <div v-if="dataForm.interchangeCode" class="orderNo-title">
-        <span>交接单编号：</span>
-        <span>{{ dataForm.interchangeCode }}</span>
-      </div>
-      <div class="customer-title">
-        <img src="@/assets/images/logo.png" class="img">
-        <div class="title">
-          航天计量检测技术（江苏）有限公司
-        </div>
-      </div>
       <detail-page title="设备交接单">
         <template #btns>
-          <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
-            打印
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="pageType = 'edit'">
+            编辑
           </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
             保存
@@ -463,6 +401,15 @@
             关闭
           </el-button>
         </template>
+        <div class="customer-title">
+          <!-- <img src="@/assets/images/logo.png" class="img"> -->
+          <div class="title">
+            航天计量检测技术（江苏）有限公司
+          </div>
+        </div>
+        <div class="interchangeReceipt-subtitle">
+          样品交接单
+        </div>
         <div id="form">
           <el-form
             ref="ruleFormRef"
@@ -473,10 +420,10 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderCode">
+                <el-form-item label="委托单号:" prop="orderNo">
                   <el-input
-                    v-model="dataForm.orderCode"
-                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    v-model="dataForm.orderNo"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托单号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
                   >
@@ -488,39 +435,48 @@
                   </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="客户联系人" prop="deliverer">
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :placeholder="pageType === 'detail' ? '' : '客户联系人'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="证书单位名称:" prop="certificationCompany">
                   <el-input
                     v-model="dataForm.certificationCompany"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                    disabled
+                    :placeholder="pageType === 'detail' ? '' : '证书单位名称'"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="传真:" prop="certificationCompanyFex">
-                  <el-input
-                    v-model="dataForm.certificationCompanyFex"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="邮编:" prop="certificationCompanyEmail">
-                  <el-input
-                    v-model="dataForm.certificationCompanyEmail"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
                   <el-input
@@ -528,17 +484,27 @@
                     type="textarea"
                     autosize
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
-                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '证书单位地址'"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="接收人:" prop="reciever">
+                <el-form-item label="电话" prop="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '电话'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="收发员:" prop="reciever">
                   <el-select
                     v-model="dataForm.reciever"
                     :disabled="pageType === 'detail'"
-                    placeholder="请选择接收人"
+                    placeholder="请选择收发员"
                     style="width: 100%;"
                     filterable
                     remote
@@ -552,224 +518,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="电话/手机:" prop="recieverPhone">
+                <el-form-item label="签收人:" prop="signee">
                   <el-input
-                    v-model="dataForm.recieverPhone"
-                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    v-model="dataForm.signee"
+                    :placeholder="pageType === 'detail' ? '' : '请输入签收人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     :disabled="pageType === 'detail'"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <el-row :gutter="24">
-              <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
-                  />
-                </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="12">
-                <el-form-item label="委托方地址:" prop="customerAddress">
-                  <el-input
-                    v-model="dataForm.customerAddress"
-                    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="传真:" prop="fax">
-                  <el-input
-                    v-model="dataForm.fax"
-                    :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-row>
-            <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="送检人" prop="deliverer">
-                  <!-- <el-select
-                    v-model="dataForm.deliverer"
-                    :disabled="pageType === 'detail'"
-                    placeholder="请选择送检人"
-                    style="width: 100%;"
-                    filterable
-                    remote
-                    remote-show-suffix
-                    :remote-method="remoteMethod"
-                    :loading="applyPersonLoading"
-                    @change="changeSelectDeliverer"
-                  >
-                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
-                  </el-select> -->
-                  <el-input
-                    v-model="dataForm.deliverer"
-                    :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="delivererTel">
-                  <el-input
-                    v-model="dataForm.delivererTel"
-                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- </el-row>
-            <el-row :gutter="24"> -->
-              <el-col :span="6">
-                <el-form-item label="委托日期:" prop="orderTime">
-                  <el-date-picker
-                    v-model="dataForm.orderTime"
-                    type="date"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    disabled
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="完成时间:" prop="requireOverTime">
-                  <el-date-picker
-                    v-model="dataForm.requireOverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="交接时间:" prop="deliverTime">
-                  <el-date-picker
-                    v-model="dataForm.deliverTime"
-                    type="datetime"
-                    class="full-width-input"
-                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="校检类别:" prop="measureCategory">
-                  <el-select
-                    v-model="dataForm.measureCategory"
-                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="保密要求:" prop="secrecy">
-                  <el-select
-                    v-model="dataForm.secrecy"
-                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
-                    :disabled="pageType === 'detail'"
-                    class="full-width-input"
-                  >
-                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
-                  </el-select>
-                </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.appearance"
-                    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="依据文件:">
-                  <el-input
-                    v-model="dataForm.relyFile"
-                    type="textarea"
-                    autosize
-                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
-                    :disabled="pageType === 'detail'"
-                    :class="{ 'detail-input': pageType === 'detail' }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-form>
-          <div style="color: red;font-size: 13px;">
-            *本交接单一式两份 双方各执一份
-          </div>
         </div>
       </detail-page>
       <!-- 表格 -->
-      <detail-block title="被测样品列表">
+      <detail-block title="交接清单">
         <template #btns>
-          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
-            扫描添加
-          </el-button>
           <el-button v-if="pageType !== 'detail'" type="primary" @click="multiAdd">
-            批量添加
+            多选样品
           </el-button>
-          <el-button v-if="pageType !== 'detail'" type="info" @click="delRow">
+          <el-button v-if="pageType !== 'detail'" type="info" @click="delSample">
             删除行
           </el-button>
         </template>
         <el-table
-          :data="list"
+          :data="sampleList"
           border
           style="width: 100%;"
           max-height="600"
@@ -785,11 +558,21 @@
             :width="item.width"
             show-overflow-tooltip
             align="center"
-          />
+          >
+            <template #default="scope">
+              <el-input
+                v-if="pageType !== 'detail' && item.value !== 'sampleName'"
+                v-model="scope.row[item.value]"
+                :placeholder="pageType === 'detail' ? ' ' : item.text"
+                :class="{ 'detail-input': pageType === 'detail' }"
+              />
+              <span v-if="pageType === 'detail' && item.value !== 'sampleName'">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </detail-block>
       <!-- 签章部分 -->
-      <div class="receipt-signature">
+      <!-- <div class="receipt-signature">
         <div class="content">
           <span class="title">甲方</span>
           <div class="deliverer-time">
@@ -802,7 +585,7 @@
 
           <div class="deliverer-time">
             <div style="display: flex;">
-              <span class="text-title">接收人:</span>
+              <span class="text-title">收发员:</span>
               <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
             </div>
             <div style="margin-top: 30px;">
@@ -812,9 +595,9 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 公司信息 -->
-      <div class="customer-info">
+      <!-- <div class="customer-info">
         <div v-for="item in customerInfoMap" :key="item.value" class="content">
           <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
             {{ item.label }}:
@@ -823,16 +606,12 @@
             {{ item.name }}
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
-    <!-- 选择委托方组件 -->
-    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
-    <!-- 选择样品组件 -->
-    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
-    <!-- 选择委托书组件 -->
+    <!-- 选择委托书下的样品清单 -->
+    <select-order-samples-dialog ref="selectOrderSamplesDialogRef" @confirm="(val: any) => confirmSelectSample(val, 'order')" />
+    <!-- 选择委托单组件 -->
     <select-order v-model:visible="orderVisible" @confirmCheckout="confirmCheckoutOrder" @changeVisible="changeOrderVisible" />
-    <!-- 标签绑定 -->
-    <bar-code-bind ref="barCodeBind" @confirm="bindLabelOver" />
   </app-container>
 </template>
 
@@ -842,6 +621,13 @@
   color: #606266;
 }
 
+.interchangeReceipt-subtitle {
+  text-align: center;
+  margin: 10px 0 32px;
+  font-size: 18px;
+  font-weight: 600;
+}
+
 .customer-title {
   display: flex;
   justify-content: center;
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
new file mode 100644
index 0000000..4612b7c
--- /dev/null
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit_bak.vue
@@ -0,0 +1,936 @@
+<!-- 设备交接单详情 -->
+<script lang="ts" setup name="ReceiptList">
+import type { Ref } from 'vue'
+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/interchangeReceipt/selectSample.vue'
+import userStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+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'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import { addInterchangeReceipt, getInterchangeReceiptDetail, updateInterchangeReceipt } from '@/api/business/schedule/interchangeReceipt'
+import { getOrderDetail, updateOrder } from '@/api/business/schedule/order'
+
+const user = userStore()
+const pageType = ref('add') // 页面类型: add, edit, detail
+const infoId = ref('') // id
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = 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 minioFileNameSignature = ref() // 签章图片
+const minioFileNameAutograph = ref() // 签名图片
+const ruleFormRef = ref() // 表单ref
+// 表单
+const dataForm: Ref<IReceiptDetail> = ref({
+  interchangeCode: '', // 交接单编号
+  orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
+  orderId: '', // 委托书id
+  certificationCompany: '', // 证书单位名称
+  certificationCompanyFex: '', // 传真
+  certificationCompanyEmail: '', // 邮编
+  reciever: user.name, // 接收人
+  recieverPhone: '', // 接收人电话
+  recieverSignFile: '', // 接收人签名文件
+  certificationCompanyAddress: '', // 证书单位地址
+  customerNo: '', // 委托方代码
+  customerId: '', // 委托方id
+  customerName: '', // 委托方名称
+  fax: '', // 委托方传真
+  postalCode: '', // 委托邮编
+  customerAddress: '', // 委托方地址
+  deliverer: '', // 送检人
+  delivererTel: '', // 送样人联系方式
+  orderTime: '', // 委托日期
+  requireOverTime: '', // 完成时间
+  deliverTime: '', // 交接时间
+  measureCategory: '', // 检校类别
+  secrecy: '', // 保密要求
+  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: 'remark', align: 'center' },
+  { text: '校准/检测项目', value: 'measureContent', 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: '', // 负责人
+  signUserId: '', // 用户id
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  signType: '',
+  ids: [],
+})
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 系统字典
+  getDictByCode('systemDict').then((response) => {
+    const tempMap = response.data.map((item: dictType) => {
+      if (item.value === 'address') {
+        item.label = '通信地址'
+      }
+      else if (item.value === 'postalCode') {
+        item.label = '邮编'
+      }
+      else if (item.value === 'tel') {
+        item.label = '电话'
+      }
+      // else if (item.value === 'fax') {
+      //   item.label = '传真'
+      // }
+      return item
+    })
+    // 删除除上述四项的其他基本信息
+    tempMap.forEach((item: dictType, index: number) => {
+      if (item.value !== 'address' && item.value !== 'postalCode' && item.value !== 'tel' && item.value !== 'fax') {
+        tempMap.splice(index, 1)
+      }
+    })
+    customerInfoMap.value = tempMap
+  })
+  // 保密要求
+  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)
+}
+// 获取签章数据
+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) {
+      if (res.data.rows.length) {
+        minioFileNameAutograph.value = res.data.rows[0].minioFileName
+        dataForm.value.recieverSignFile = res.data.rows[0].minioFileName // 接收人签字文件
+      }
+      else {
+        minioFileNameAutograph.value = ''
+        dataForm.value.recieverSignFile = ''
+      }
+    }
+  })
+}
+
+// 从路由中获取页面类型参数
+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 submit = () => {}
+
+// ----------------------------委托书----------------------------------------------------
+// 点击选择委托书编号
+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.orderNo = val[0].orderCode // 委托书编号
+    dataForm.value.orderId = val[0].id // 委托书id
+    dataForm.value.deliverer = val[0].deliverer // 送检人
+    dataForm.value.delivererTel = val[0].delivererTel // 送检人
+    dataForm.value.orderTime = val[0].orderTime // 委托日期
+    dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
+    dataForm.value.customerNo = val[0].customerNo // 委托方代码
+    dataForm.value.customerId = val[0].customerId // 委托方id
+    dataForm.value.customerName = val[0].customerName // 委托方名称
+    dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    dataForm.value.certificationCompany = val[0].certificationCompany! // 证书单位名称
+    dataForm.value.certificationCompanyAddress = val[0].certificationCompanyAddress! // 证书单位地址
+    list.value = []
+  }
+}
+
+// ----------------------------------样品----------------------------------------------
+// 点击批量增加
+const multiAdd = () => {
+  if (!dataForm.value.orderCode) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  if (!dataForm.value.customerNo) {
+    ElMessage.warning('没有委托方代码，请检查')
+    return
+  }
+  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 (!dataForm.value.recieverSignFile) {
+    ElMessage({
+      message: '此接收人没有对应签名，请前往系统设置-常用工具-签名管理添加',
+      type: 'warning',
+      duration: 5000,
+    })
+    return
+  }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
+  if (!formEl) { return }
+  formEl.validate((valid) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        const params = {
+          ...dataForm.value, // 表单
+          customerSampleInfoList: list.value, // 表格
+        }
+        if (pageType.value === 'edit') { // 编辑
+          updateInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        if (pageType.value === 'add') { // 新建
+          addInterchangeReceipt(params).then(() => {
+            ElMessage.success('已保存')
+            $router.go(-1)
+          })
+        }
+        // 更新委托书的证书单位名称和证书单位地址
+        getOrderDetail({ id: dataForm.value.orderId }).then((res) => {
+          let responseData = {} as any
+          responseData = res.data
+          responseData.certificationCompany = dataForm.value.certificationCompany // 证书单位名称
+          responseData.certificationCompanyAddress = dataForm.value.certificationCompanyAddress // 证书单位地址
+          updateOrder(responseData) // 更新委托书
+        })
+      })
+    }
+  })
+}
+
+// 点击扫描添加
+const barCodeBind = ref()
+const scanAdd = () => {
+  barCodeBind.value.initDialog('')
+}
+// 扫描完成
+const bindLabelOver = () => {
+  // 逻辑
+}
+
+/**
+ * 选好接收人
+ * @param userId 用户id
+ */
+const changeSelectReceiver = (userId: string) => {
+  // 在用户列表里找到选择的接收人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.reciever = name
+  searchQueryAutograph.signUserId = userId // 通过接收人的用户id查询签名
+  getAutographList() // 调对应接收人的签名
+}
+
+/**
+ * 选好送检人
+ * @param userId 用户id
+ */
+const changeSelectDeliverer = (userId: string) => {
+  // 在用户列表里找到选择的送检人的名字
+  const name = usePersonList.value.find(item => item.id === userId)!.name
+  dataForm.value.deliverer = name
+}
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 获取详情信息
+const fetchInterchangeReceiptDetail = () => {
+  getInterchangeReceiptDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data // 表单
+    list.value = res.data.customerSampleList // 样品列表
+    minioFileNameAutograph.value = res.data.recieverSignFile // 签名图片
+  })
+}
+
+// 点击打印
+const printObj = ref({
+  id: 'main', // 需要打印元素的id
+  popTitle: '设备交接单详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3></h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+onMounted(async () => {
+  await getDict() // 获取字典
+  nextTick(() => {
+    if (pageType.value === 'add') {
+      dataForm.value.deliverTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') // 交接时间
+    }
+    else {
+      fetchInterchangeReceiptDetail() // 获取详情信息
+    }
+    getSignatureList() // 获取签章数据
+    fetchUserList() // 获取用户列表
+    searchQueryAutograph.signUserId = user.id
+    getAutographList()
+  })
+})
+</script>
+
+<template>
+  <app-container>
+    <div id="main">
+      <div v-if="dataForm.interchangeCode" class="orderNo-title">
+        <span>交接单编号：</span>
+        <span>{{ dataForm.interchangeCode }}</span>
+      </div>
+      <div class="customer-title">
+        <img src="@/assets/images/logo.png" class="img">
+        <div class="title">
+          航天计量检测技术（江苏）有限公司
+        </div>
+      </div>
+      <detail-page title="设备交接单">
+        <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="orderCode">
+                  <el-input
+                    v-model="dataForm.orderCode"
+                    :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  >
+                    <template v-if="pageType !== 'detail'" #append>
+                      <el-button size="small" @click="handleClickOrder">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="证书单位名称:" prop="certificationCompany">
+                  <el-input
+                    v-model="dataForm.certificationCompany"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位名称'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="传真:" prop="certificationCompanyFex">
+                  <el-input
+                    v-model="dataForm.certificationCompanyFex"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位传真'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="邮编:" prop="certificationCompanyEmail">
+                  <el-input
+                    v-model="dataForm.certificationCompanyEmail"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位邮编'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="证书单位地址:" prop="certificationCompanyAddress">
+                  <el-input
+                    v-model="dataForm.certificationCompanyAddress"
+                    type="textarea"
+                    autosize
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :placeholder="pageType === 'detail' ? '' : '请输入证书单位地址'"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接收人:" prop="reciever">
+                  <el-select
+                    v-model="dataForm.reciever"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择接收人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectReceiver"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电话/手机:" prop="recieverPhone">
+                  <el-input
+                    v-model="dataForm.recieverPhone"
+                    :placeholder="pageType === 'detail' ? '' : '请输入接收人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="24">
+              <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
+                  />
+                </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="12">
+                <el-form-item label="委托方地址:" prop="customerAddress">
+                  <el-input
+                    v-model="dataForm.customerAddress"
+                    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="传真:" prop="fax">
+                  <el-input
+                    v-model="dataForm.fax"
+                    :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-row>
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="送检人" prop="deliverer">
+                  <!-- <el-select
+                    v-model="dataForm.deliverer"
+                    :disabled="pageType === 'detail'"
+                    placeholder="请选择送检人"
+                    style="width: 100%;"
+                    filterable
+                    remote
+                    remote-show-suffix
+                    :remote-method="remoteMethod"
+                    :loading="applyPersonLoading"
+                    @change="changeSelectDeliverer"
+                  >
+                    <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select> -->
+                  <el-input
+                    v-model="dataForm.deliverer"
+                    :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="delivererTel">
+                  <el-input
+                    v-model="dataForm.delivererTel"
+                    :placeholder="pageType === 'detail' ? '' : '请输入送检人电话/手机'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- </el-row>
+            <el-row :gutter="24"> -->
+              <el-col :span="6">
+                <el-form-item label="委托日期:" prop="orderTime">
+                  <el-date-picker
+                    v-model="dataForm.orderTime"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="完成时间:" prop="requireOverTime">
+                  <el-date-picker
+                    v-model="dataForm.requireOverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择完成时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="交接时间:" prop="deliverTime">
+                  <el-date-picker
+                    v-model="dataForm.deliverTime"
+                    type="datetime"
+                    class="full-width-input"
+                    :placeholder="pageType === 'detail' ? '' : '请选择交接时间'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                    :disabled="pageType === 'detail'"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="校检类别:" prop="measureCategory">
+                  <el-select
+                    v-model="dataForm.measureCategory"
+                    :placeholder="pageType === 'detail' ? '' : '请选择校检类别'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="保密要求:" prop="secrecy">
+                  <el-select
+                    v-model="dataForm.secrecy"
+                    :placeholder="pageType === 'detail' ? '' : '请选择保密要求'"
+                    :disabled="pageType === 'detail'"
+                    class="full-width-input"
+                  >
+                    <el-option v-for="item of secrecyList" :key="item.value" :label="item.name" :value="item.value" />
+                  </el-select>
+                </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.appearance"
+                    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="依据文件:">
+                  <el-input
+                    v-model="dataForm.relyFile"
+                    type="textarea"
+                    autosize
+                    :placeholder="pageType === 'detail' ? '' : '请输入依据文件'"
+                    :disabled="pageType === 'detail'"
+                    :class="{ 'detail-input': pageType === 'detail' }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div style="color: red;font-size: 13px;">
+            *本交接单一式两份 双方各执一份
+          </div>
+        </div>
+      </detail-page>
+      <!-- 表格 -->
+      <detail-block title="被测样品列表">
+        <template #btns>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="scanAdd">
+            扫描添加
+          </el-button>
+          <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
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <!-- 签章部分 -->
+      <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 style="display: flex;">
+              <span class="text-title">接收人:</span>
+              <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="minioFileNameAutograph" />
+            </div>
+            <div style="margin-top: 30px;">
+              <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
+              <span class="text">{{ dataForm.deliverTime }}</span>
+              <show-photo style="position: absolute;left: 360px; top: 1px;" :minio-file-name="minioFileNameSignature" />
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 公司信息 -->
+      <div class="customer-info">
+        <div v-for="item in customerInfoMap" :key="item.value" class="content">
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="title">
+            {{ item.label }}:
+          </div>
+          <div v-if="item.value === 'address' || item.value === 'postalCode' || item.value === 'tel'" class="value">
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选择委托方组件 -->
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
+    <!-- 选择样品组件 -->
+    <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @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;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  margin: 24px 0;
+
+  .img {
+    width: 32px;
+    height: 32px;
+    margin-right: 14px;
+    vertical-align: middle;
+  }
+}
+
+.customer-info {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: nowrap;
+  margin: 40px 0;
+
+  .content {
+    display: flex;
+    font-size: 14px;
+
+    .title {
+      font-weight: 600;
+      color: #000;
+    }
+
+    .value {
+      margin-left: 10px;
+    }
+  }
+}
+
+.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 4b4432e..26f45d5 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -1,12 +1,12 @@
 // 查询参数
 export interface IListQuery {
-  interchangeCode: string // 交接单编号
-  customerNo: string // 委托方代码
-  customerName: string // 委托方名称
-  reciever: string // 接收人
-  deliverer: string // 送样人
-  startTime: string // 交接开始时间
-  endTime: string // 交接结束时间
+  customerName: string //	委托方名称
+  customerNo: string //	委托方编号
+  deliverer: string //	联系人/送检人
+  interchangeCode: string //		交接单编号
+  reciever: string //		收发员
+  startTime: string //		交接开始时间
+  endTime: string //	交接结束时间
   offset: number
   limit: number
 }
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList.vue b/src/views/business/schedule/interchangeReceipt/receiptList.vue
index b0f211d..a77221a 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptList.vue
@@ -7,19 +7,19 @@
 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'
+import { delInterchangeReceiptList, deleteReceiptList, exportReceiptList, getReceiptList } from '@/api/business/schedule/interchangeReceipt'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 })
@@ -29,27 +29,27 @@
 })
 // 重新赋值
 listQuery.value = renewSearchParams('schedule-interchangeReceipt') || {
-  interchangeCode: '', // 交接单编号
-  customerNo: '', // 委托方代码
-  customerName: '', // 委托方名称
-  reciever: '', // 接收人
-  deliverer: '', // 送样人
-  startTime: '', // 交接开始时间
-  endTime: '', // 交接结束时间
+  customerName: '', //	委托方名称
+  customerNo: '', //	委托方编号
+  deliverer: '', //	联系人/送检人
+  interchangeCode: '', //		交接单编号
+  reciever: '', //		收发员
+  startTime: '', //		交接开始时间
+  endTime: '', //	交接结束时间
   offset: 1,
   limit: 20,
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '交接单编号', value: 'interchangeCode', align: 'center', width: '160px' },
-  { text: '委托方代码', value: 'customerNo', align: 'center', width: '160px' },
+  { text: '委托单编号', value: 'orderNo', align: 'center', width: '160px' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '接收人', value: 'reciever', align: 'center' },
-  { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '交接时间', value: 'deliverTime', align: 'center', width: '180px' },
-  // { text: '备注', value: 'remark', align: 'center' },
+  { text: '联系人', value: 'deliverer', align: 'center' },
+  { text: '电话', value: 'delivererTel', align: 'center' },
+  { text: '证书单位名称', value: 'certificationCompany', align: 'center' },
+  { text: '收发员', value: 'reciever', align: 'center', width: '180px' },
+  { text: '签收人', value: 'signee', align: 'center' },
+  { text: '交接样品数量', value: 'sampleAmount', align: 'center' },
 ])
-const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IReceiptList[]>([])
 // 总数
@@ -58,26 +58,14 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 时间变更
-watch(timeRange, (val) => {
-  if (val) {
-    listQuery.value.startTime = `${val[0]}`
-    listQuery.value.endTime = `${val[1]}`
-  }
-  else {
-    listQuery.value.startTime = ''
-    listQuery.value.endTime = ''
-  }
-})
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
-  // if (!isNowPage) {
-  //   // 是否显示当前页，否则跳转第一页
-  //   listQuery.value.offset = 1
-  // }
-  // listQuery.value.startTime = timeRange.value[0] as string || ''
-  // listQuery.value.endTime = timeRange.value[1] as string || ''
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
   getReceiptList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -111,17 +99,16 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    interchangeCode: '', // 交接单编号
-    customerNo: '', // 委托方代码
-    customerName: '', // 委托方名称
-    reciever: '', // 接收人
-    deliverer: '', // 送样人
-    startTime: '', // 交接开始时间
-    endTime: '', // 交接结束时间
+    customerName: '', //	委托方名称
+    customerNo: '', //	委托方编号
+    deliverer: '', //	联系人/送检人
+    interchangeCode: '', //		交接单编号
+    reciever: '', //		收发员
+    startTime: '', //		交接开始时间
+    endTime: '', //	交接结束时间
     offset: 1,
     limit: 20,
   }
-  timeRange.value = ['', ''] // 置空筛选时间
   fetchData(true)
 }
 
@@ -150,13 +137,13 @@
   })
   if (list.value.length > 0) {
     const params = {
-      interchangeCode: listQuery.value.interchangeCode, // 交接单编号
-      customerNo: listQuery.value.customerNo, // 委托方代码
-      customerName: listQuery.value.customerName, // 委托方名称
-      reciever: listQuery.value.reciever, // 接收人
-      deliverer: listQuery.value.deliverer, // 送样人
-      startTime: listQuery.value.startTime, // 交接开始时间
-      endTime: listQuery.value.endTime, // 交接结束时间
+      customerName: listQuery.value.customerName, //	委托方名称
+      customerNo: listQuery.value.customerNo, //	委托方编号
+      deliverer: listQuery.value.deliverer, //	联系人/送检人
+      interchangeCode: listQuery.value.interchangeCode, //		交接单编号
+      reciever: listQuery.value.reciever, //		收发员
+      startTime: listQuery.value.startTime, //		交接开始时间
+      endTime: listQuery.value.endTime, //	交接结束时间
       offset: 1,
       limit: 20,
       ids: checkoutList.value,
@@ -193,6 +180,14 @@
   }
 }
 
+// 删除
+const del = (id: string) => {
+  delInterchangeReceiptList({ id }).then((res) => {
+    ElMessage.warning('删除成功')
+    fetchData(true)
+  })
+}
+
 onMounted(() => {
   fetchData(true)
 })
@@ -206,16 +201,8 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.interchangeCode"
-          placeholder="交接单编号"
-          class="short-input"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.customerNo"
-          placeholder="委托方代码"
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托单编号"
           class="short-input"
           clearable
         />
@@ -230,33 +217,20 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.reciever"
-          placeholder="接收人"
+          v-model.trim="listQuery.deliverer"
+          placeholder="联系人"
           class="short-input"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.deliverer"
-          placeholder="送检人"
+          v-model.trim="listQuery.reciever"
+          placeholder="收发员"
           class="short-input"
           clearable
         />
       </search-item>
-      <search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="到"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            start-placeholder="交接开始时间"
-            end-placeholder="交接结束时间"
-          />
-        </search-item>
-      </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
@@ -296,7 +270,7 @@
               >
                 详情
               </el-button>
-              <el-button
+              <!-- <el-button
                 v-if="proxy.hasPerm('/schedule/receiptList/cancle')"
                 size="small"
                 link
@@ -304,6 +278,14 @@
                 @click="handleCancle(row.id)"
               >
                 取消
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="danger"
+                @click="del(row.id)"
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 251f768..7e9613f 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,8 @@
 import { addOrder, getOrderDetail, getStream, updateOrder } from '@/api/business/schedule/order'
 import selectStaffList from '@/views/business/fieldTest/components/selectStaffList.vue'
 import { printPdf } from '@/utils/printUtils'
+import { getUserList } from '@/api/system/user'
+import { exportFile } from '@/utils/exportUtils'
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
@@ -54,6 +56,9 @@
   delivererTel: '', // 移动电话
   email: '', // 电子邮件或qq
   invoiceCompany: '', // 发票单位名称
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })
 const checkCertificateList = ref([]) as any// 对证书要求多选框
 const scanSampleRef = ref() // 标签绑定弹窗ref
@@ -62,6 +67,7 @@
 const isUrgentMap = ref<dictType[]>([]) // 是否加急
 const sampleStatusMap = ref([]) as any// 样品状态
 const customerInfoMap = ref<dictType[]>([]) // 系统字典--航天计量检测技术（江苏）有限公司基本信息
+const userList = ref<any[]>([]) // 人员列表
 
 const list = ref<ISampleList[]>([])// 表格数据
 // 选中的内容
@@ -75,7 +81,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   { text: '检测项目', value: 'measureContent', align: 'center', required: false },
   // { text: '样品状态', value: 'sampleStatusName', align: 'center' },
   { text: '检测依据标准', value: 'accordStandard', align: 'center', required: false },
@@ -90,7 +96,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
-  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
+  { text: '外观状态', value: 'appearanceStatus', align: 'center', required: false },
   // { text: '客户特殊要求', value: 'specialRequire', align: 'center', required: false },
   { text: '备注', value: 'remark', align: 'center', required: false },
 ])
@@ -123,6 +129,8 @@
 
   deliverer: [{ required: true, message: '联系人必填', trigger: 'blur' }],
   delivererTel: [{ required: true, message: '移动电话必填', trigger: 'blur' }],
+  busPersonId: [{ required: true, message: '业务员必填', trigger: 'blur' }],
+
   // phone: [{ required: true, message: '固定电话必填', trigger: 'blur' }],
   // email: [{ required: true, message: '电子邮件/QQ必填', trigger: 'blur' }],
   // invoiceCompany: [{ required: true, message: '发票单位名称必填', trigger: 'blur' }],
@@ -188,6 +196,10 @@
     })
     customerInfoMap.value = tempMap
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 
 // 点击选择
@@ -257,6 +269,7 @@
         ...item,
         // measureContent: '', // 检定项目置空
         isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+        appearanceStatus: '正常',
       })
     }
   })
@@ -302,7 +315,7 @@
     sampleModel: '', // 样品型号
     manufacturingNo: '', // 出厂编号
     appendixDescn: '', // 附件说明
-    appearanceStatus: '', // 外观状态
+    appearanceStatus: '正常', // 外观状态
     measureContent: '', // 检测依据标准
     certificateRequire: '', // 证书要求
     specialRequire: '', // 客户特殊要求
@@ -460,12 +473,26 @@
       ...item,
       isEdit: true, // 是否可编辑
       isExistSample: '1', // 是否存在样品库中 1存在、0不存在
+      appearanceStatus: '正常',
       delId: getUid(),
     })
   })
   scanSampleRef.value.closeDialog()
 }
 // --------------------------------------------------------------------------------------
+// 点击导出
+const exportExcel = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const exportTitle = orderType.value === 'measure' ? '检测委托单' : '检定或校准委托单'
+  getStream({ id: infoId.value, excel: true }).then((res) => {
+    exportFile(res.data, `${exportTitle}.xls`)
+    loading.close()
+  })
+}
 
 // 点击打印
 const printPDF = () => {
@@ -473,9 +500,9 @@
     lock: true,
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  getStream({ id: infoId.value }).then((res) => {
+  getStream({ id: infoId.value, excel: true }).then((res) => {
     loading.close()
-    const pdfStream = new Blob([res.data])
+    const pdfStream = new Blob([res.data], { type: 'application/pdf' })
     const blobUrl = URL.createObjectURL(pdfStream)
     printPdf(blobUrl)
   })
@@ -533,6 +560,14 @@
   dataForm.value.staffName = val[0].name// 收件人名称
 }
 // -----------------------------------------------------------------------------------------------
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
+
 watch(() => orderType.value, (newValue) => {
   if (newValue === 'measure') {
     columns.value = columnsMeasure.value
@@ -566,6 +601,9 @@
       </div> -->
       <detail-page :title="orderType === 'measure' ? '检测委托单' : '检定或校准委托单'">
         <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportExcel">
+            导出
+          </el-button>
           <el-button v-if="pageType === 'detail'" type="primary" @click="printPDF">
             打印
           </el-button>
@@ -865,6 +903,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务员:" prop="busPersonId">
+                  <el-select
+                    v-model="dataForm.busPersonId"
+                    placeholder="请选择业务员"
+                    class="full-width-input"
+                    :disabled="pageType === 'detail'"
+                    filterable
+                    @change="changeBusPersonId"
+                  >
+                    <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <!-- <el-row :gutter="24">
               <el-col :span="8">
@@ -968,9 +1020,9 @@
             <template v-if="(pageType === 'add' || pageType === 'edit')" #default="scope">
               <!-- 手动增加行-名称、型号、编号可编辑 -->
               <el-input
-                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo') && scope.row.isEdit"
+                v-if="(!scope.row.sampleNo || scope.row.sampleNo === '系统自动生成') && (item.value === 'sampleNo' || item.value === 'sampleName' || item.value === 'sampleModel' || item.value === 'manufacturingNo' || item.value === 'manufacturer') && scope.row.isEdit"
                 v-model="scope.row[item.value]"
-                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `请输入${item.text}`"
+                :placeholder="item.value === 'sampleNo' ? '系统自动生成' : `${item.text}`"
                 :disabled="item.disabled"
               />
               <!-- 手动增加行可编辑：附件说明、检定项目、备注、检测依据标准 -->
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 90fbef7..706621f 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -6,7 +6,7 @@
   customerName: string // 委托方名称
   deliverer: string // 送样人
   isUrgent: number | string // 是否加急
-  status: number | string// 接收状态
+  status: number | string // 接收状态
   offset: number
   limit: number
 }
@@ -33,7 +33,7 @@
   certificationCompany?: string // 证书单位名称
   certificationCompanyAddress?: string // 证书单位地址
   orderType: string // 委托单类型
-
+  appearanceStatus?: string // 外观
 }
 
 // 详情表单
@@ -68,6 +68,9 @@
   delivererTel: string // 移动电话
   email: string // 电子邮件或qq
   invoiceCompany: string // 发票单位名称
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 样品清单
diff --git a/src/views/business/subpackage/approve/edit.vue b/src/views/business/subpackage/approve/edit.vue
index 7fbf3b9..2390495 100644
--- a/src/views/business/subpackage/approve/edit.vue
+++ b/src/views/business/subpackage/approve/edit.vue
@@ -558,15 +558,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="14">
diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue
index 93eec9d..16e45d1 100644
--- a/src/views/business/subpackage/approve/list.vue
+++ b/src/views/business/subpackage/approve/list.vue
@@ -119,7 +119,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/business/subpackage/record/edit.vue b/src/views/business/subpackage/record/edit.vue
index 991b0bd..1754712 100644
--- a/src/views/business/subpackage/record/edit.vue
+++ b/src/views/business/subpackage/record/edit.vue
@@ -888,18 +888,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -911,7 +915,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 0dce98a..e280565 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -81,7 +81,7 @@
     list.value = response.data.rows.map((item: { addressProvinceName: string; addressCityName: string }) => {
       return {
         ...item,
-        fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
+        // fullAddress: (item.addressProvinceName === item.addressCityName) ? item.addressCityName : item.addressProvinceName + item.addressCityName,
       }
     })
     total.value = parseInt(response.data.total)
diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue
index 9ff1fd8..25c2ad8 100644
--- a/src/views/customer/customerInfo/customerEdit.vue
+++ b/src/views/customer/customerInfo/customerEdit.vue
@@ -761,18 +761,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
-            </el-form-item>
-          </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="fullAddress" :detail="pageType === 'detail'" @on-change="fullAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceFullAddress" :detail="pageType === 'detail'" @on-change="invoiceFullAddressChange" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="dataForm.businessScope"
@@ -784,7 +788,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="dataForm.remark"
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 38f934e..6b6bde8 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -15,6 +15,7 @@
 import { UploadFile } from '@/api/measure/file'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { getUserList } from '@/api/system/user'
 import type { IRecord } from '@/views/business/schedule/interchange/interchange_interface'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -30,6 +31,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const userList = ref<any[]>([]) // 人员列表
 const ABCList = ref<dictType[]>([]) // ABC
 const dataForm: Ref<ISampleEdit> = ref({
   id: '',
@@ -59,6 +61,9 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+
+  busPersonId: '', 	// 业务员id
+  busPersonName: '', 	// 业务员名字
 })// 表单
 const ruleFormRef = ref<FormInstance>()
 
@@ -87,6 +92,7 @@
   // customerAddress: [{ required: true, message: '委托方地址必填', trigger: 'change' }],
   // measureContent: [{ required: true, message: '检定项目必填', trigger: 'blur' }],
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  // busPersonId: [{ required: true, message: '业务员必填', trigger: 'change' }],
   // powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
 }) // 表单验证规则
 
@@ -114,6 +120,10 @@
   getDictByCode('powerVoltage').then((response) => {
     powerVoltageList.value = response.data
   })
+  // 获取人员列表
+  getUserList({ offset: 1, limit: 999999 }).then((res) => {
+    userList.value = res.data.rows
+  })
 }
 getDict()
 
@@ -359,7 +369,13 @@
   }
 }
 // ----------------------------------------------------------------------------------
-
+// 业务员选择事件
+const changeBusPersonId = (val: string) => {
+  const index = userList.value.findIndex(item => item.id === val)
+  if (index !== -1) {
+    dataForm.value.busPersonName = userList.value[index].name
+  }
+}
 // 非添加页面获取详情
 if (pageType.value !== 'add') {
   getInfo()
@@ -628,6 +644,20 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:" prop="busPersonId">
+                <el-select
+                  v-model="dataForm.busPersonId"
+                  placeholder="请选择业务员"
+                  class="full-width-input"
+                  :disabled="pageType === 'detail'"
+                  filterable
+                  @change="changeBusPersonId"
+                >
+                  <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index fce43f4..22f9aee 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -58,6 +58,7 @@
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期(月)', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   { text: '样品状态', value: 'sampleStatusName', align: 'center', width: '80px' },
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 629398f..2687603 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -57,6 +57,9 @@
   measureLastTime?: string // 检定日期
   validDeadline?: string // 有效日期
   powerVoltage: string // 电源电压
+
+  busPersonId: string // 业务员id
+  busPersonName: string // 业务员名字
 }
 
 // 检定记录
diff --git a/src/views/customer/sample/overTime/detail.vue b/src/views/customer/sample/overTime/detail.vue
index 608d93f..4073116 100644
--- a/src/views/customer/sample/overTime/detail.vue
+++ b/src/views/customer/sample/overTime/detail.vue
@@ -55,6 +55,7 @@
   measureLastTime: '', // 检定日期
   validDeadline: '', // 有效日期
   powerVoltage: '', // 电源电压
+  busPersonName: '', // 业务员
 })
 
 // 获取字典值
@@ -503,6 +504,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务员:">
+                <el-input
+                  v-model="dataForm.busPersonName"
+                  :placeholder="pageType === 'detail' ? '' : '业务员'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index 0fa35e3..2e935ec 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -55,6 +55,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方代码', value: 'customerNo', align: 'center', width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '业务员', value: 'busPersonName', align: 'center' },
   { text: '检定周期', value: 'measurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
   {
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index fb675de..e9785cc 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -53,6 +53,7 @@
   measureLastTime?: string // 检定日期
   validDeadline?: string // 有效日期
   powerVoltage: string // 电源电压
+  busPersonName: string // 业务员
 }
 
 // 检定记录
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2b03161..0137c1c 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -171,9 +171,12 @@
     fetchData(true)
   }
   else {
+    console.log('ppppp', val)
+
     active.value = val
     activeTitle.value = menu.value.find(item => item.id === val)!.name
     window.sessionStorage.setItem('borrowhandleActive', val)
+    fetchData(true)
     // clearList()
   }
 }
diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue
index 3774177..8b83ff3 100644
--- a/src/views/finance/contract/list.vue
+++ b/src/views/finance/contract/list.vue
@@ -101,6 +101,7 @@
   // }
   // listQuery.value.estimateSignStartDate = dateRange.value[0] as string || ''
   // listQuery.value.estimateSignEndDate = dateRange.value[1] as string || ''
+  if (!listQuery.value.approvalStatus) { return }
   getContractList(listQuery.value).then((response) => {
     list.value = response.data.rows.map((item: { estimateSignDate: string; agreementAmount: number }) => {
       return {
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index 2c5c2ff..dad77d6 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -189,15 +189,19 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="5">
-        <el-form-item label="公司地址:">
-          <address-select :data="companyAddress" detail />
-        </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="公司地址:">
+            <address-select style="width: 100%;" :data="companyAddress" detail />
+          </el-form-item>
+        </el-col>
       </el-row>
-      <el-row :gutter="5">
-        <el-form-item label="开票地址:">
-          <address-select :data="invoiceAddress" detail />
-        </el-form-item>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="开票地址:">
+            <address-select style="width: 100%;" :data="invoiceAddress" detail />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 9560cba..187d065 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -355,8 +355,8 @@
           <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
         </search-item>
         <search-item>
-          <address-select :is-show-detailed-address="false" :data="companyAddress" @on-change="companyAddressChange" />
-          <!-- <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable /> -->
+          <!-- <address-select :is-show-detailed-address="false" :data="companyAddress" @on-change="companyAddressChange" /> -->
+          <el-input v-model.trim="listQuery.companyAddress" placeholder="地址" clearable />
         </search-item>
       </search-area>
       <table-container>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 026a3ae..71ebaa6 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -526,15 +526,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="公司地址:">
-              <address-select :data="companyAddress" @on-change="companyAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="公司地址:">
+                <address-select style="width: 100%;" :data="companyAddress" @on-change="companyAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="5">
-            <el-form-item label="开票地址:">
-              <address-select :data="invoiceAddress" @on-change="invoiceAddressChange" />
-            </el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="开票地址:">
+                <address-select style="width: 100%;" :data="invoiceAddress" @on-change="invoiceAddressChange" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="12">