diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
new file mode 100644
index 0000000..15ce154
--- /dev/null
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -0,0 +1,629 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="InterchangeDetail">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import { getDictByCode } from '@/api/system/dict'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  measureContent: '', // 检定项目
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+})// 表单
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: string, callback: Function) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '要求样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 检定方式
+  getDictByCode('measureType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
+}
+getDict()
+
+// 获取检定记录
+const fetchMeasureRecords = (query = null) => {
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
+}
+
+// 获取检定证书
+const fetchCertifications = (query = null) => {
+  if (pageType.value === 'detail') {
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
+  }
+}
+
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 获取详细信息
+const getInfo = () => {
+  getSapmleDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                >
+                  <template v-if="pageType !== 'detail'" #append>
+                    <el-button size="small" @click="customerNoFocus">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="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="校检类别:">
+                <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="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电源电压:" prop="powerVoltage">
+                <el-select
+                  v-model="dataForm.powerVoltage"
+                  :placeholder="pageType === 'detail' ? '' : '请选择电源电压'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of powerVoltageList" :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="measurePeriod">
+                <el-input
+                  v-model="dataForm.measurePeriod"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="检定日期:">
+                <el-date-picker
+                  v-model="dataForm.measureLastTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="有效日期:">
+                <el-date-picker
+                  v-model="dataForm.validDeadline"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.measureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  disabled
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="检定项目:" prop="measureContent">
+                <el-input
+                  v-model="dataForm.measureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
new file mode 100644
index 0000000..15ce154
--- /dev/null
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -0,0 +1,629 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="InterchangeDetail">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import { getDictByCode } from '@/api/system/dict'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  measureContent: '', // 检定项目
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+})// 表单
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: string, callback: Function) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '要求样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 检定方式
+  getDictByCode('measureType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
+}
+getDict()
+
+// 获取检定记录
+const fetchMeasureRecords = (query = null) => {
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
+}
+
+// 获取检定证书
+const fetchCertifications = (query = null) => {
+  if (pageType.value === 'detail') {
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
+  }
+}
+
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 获取详细信息
+const getInfo = () => {
+  getSapmleDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                >
+                  <template v-if="pageType !== 'detail'" #append>
+                    <el-button size="small" @click="customerNoFocus">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="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="校检类别:">
+                <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="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电源电压:" prop="powerVoltage">
+                <el-select
+                  v-model="dataForm.powerVoltage"
+                  :placeholder="pageType === 'detail' ? '' : '请选择电源电压'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of powerVoltageList" :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="measurePeriod">
+                <el-input
+                  v-model="dataForm.measurePeriod"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="检定日期:">
+                <el-date-picker
+                  v-model="dataForm.measureLastTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="有效日期:">
+                <el-date-picker
+                  v-model="dataForm.validDeadline"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.measureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  disabled
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="检定项目:" prop="measureContent">
+                <el-input
+                  v-model="dataForm.measureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index b4a9d9c..f6c0768 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -49,12 +49,12 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
-  { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
+  { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
@@ -62,7 +62,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
@@ -359,7 +359,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.sampleId}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.sampleId}`)
 }
 
 onMounted(async () => {

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
new file mode 100644
index 0000000..15ce154
--- /dev/null
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -0,0 +1,629 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="InterchangeDetail">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import { getDictByCode } from '@/api/system/dict'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  measureContent: '', // 检定项目
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+})// 表单
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: string, callback: Function) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '要求样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 检定方式
+  getDictByCode('measureType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
+}
+getDict()
+
+// 获取检定记录
+const fetchMeasureRecords = (query = null) => {
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
+}
+
+// 获取检定证书
+const fetchCertifications = (query = null) => {
+  if (pageType.value === 'detail') {
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
+  }
+}
+
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 获取详细信息
+const getInfo = () => {
+  getSapmleDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                >
+                  <template v-if="pageType !== 'detail'" #append>
+                    <el-button size="small" @click="customerNoFocus">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="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="校检类别:">
+                <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="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电源电压:" prop="powerVoltage">
+                <el-select
+                  v-model="dataForm.powerVoltage"
+                  :placeholder="pageType === 'detail' ? '' : '请选择电源电压'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of powerVoltageList" :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="measurePeriod">
+                <el-input
+                  v-model="dataForm.measurePeriod"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="检定日期:">
+                <el-date-picker
+                  v-model="dataForm.measureLastTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="有效日期:">
+                <el-date-picker
+                  v-model="dataForm.validDeadline"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.measureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  disabled
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="检定项目:" prop="measureContent">
+                <el-input
+                  v-model="dataForm.measureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index b4a9d9c..f6c0768 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -49,12 +49,12 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
-  { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
+  { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
@@ -62,7 +62,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
@@ -359,7 +359,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.sampleId}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.sampleId}`)
 }
 
 onMounted(async () => {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 1ba8293..2eed09b 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -39,6 +39,7 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -95,8 +96,8 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
-  { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'specialRequire', align: 'center' },
+  { text: '外观', value: 'remark', align: 'center' },
+  { text: '检定要求', value: 'measureContent', align: 'center' },
 ])
 
 // 签章查询数据
@@ -228,6 +229,7 @@
     dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    list.value = []
   }
 }
 
@@ -282,6 +284,14 @@
     })
     return
   }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -427,9 +437,9 @@
           >
             <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"
+                    v-model="dataForm.orderNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
new file mode 100644
index 0000000..15ce154
--- /dev/null
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -0,0 +1,629 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="InterchangeDetail">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import { getDictByCode } from '@/api/system/dict'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  measureContent: '', // 检定项目
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+})// 表单
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: string, callback: Function) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '要求样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 检定方式
+  getDictByCode('measureType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
+}
+getDict()
+
+// 获取检定记录
+const fetchMeasureRecords = (query = null) => {
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
+}
+
+// 获取检定证书
+const fetchCertifications = (query = null) => {
+  if (pageType.value === 'detail') {
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
+  }
+}
+
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 获取详细信息
+const getInfo = () => {
+  getSapmleDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                >
+                  <template v-if="pageType !== 'detail'" #append>
+                    <el-button size="small" @click="customerNoFocus">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="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="校检类别:">
+                <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="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电源电压:" prop="powerVoltage">
+                <el-select
+                  v-model="dataForm.powerVoltage"
+                  :placeholder="pageType === 'detail' ? '' : '请选择电源电压'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of powerVoltageList" :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="measurePeriod">
+                <el-input
+                  v-model="dataForm.measurePeriod"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="检定日期:">
+                <el-date-picker
+                  v-model="dataForm.measureLastTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="有效日期:">
+                <el-date-picker
+                  v-model="dataForm.validDeadline"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.measureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  disabled
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="检定项目:" prop="measureContent">
+                <el-input
+                  v-model="dataForm.measureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index b4a9d9c..f6c0768 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -49,12 +49,12 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
-  { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
+  { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
@@ -62,7 +62,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
@@ -359,7 +359,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.sampleId}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.sampleId}`)
 }
 
 onMounted(async () => {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 1ba8293..2eed09b 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -39,6 +39,7 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -95,8 +96,8 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
-  { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'specialRequire', align: 'center' },
+  { text: '外观', value: 'remark', align: 'center' },
+  { text: '检定要求', value: 'measureContent', align: 'center' },
 ])
 
 // 签章查询数据
@@ -228,6 +229,7 @@
     dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    list.value = []
   }
 }
 
@@ -282,6 +284,14 @@
     })
     return
   }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -427,9 +437,9 @@
           >
             <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"
+                    v-model="dataForm.orderNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index a657382..b3089b4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,6 +27,7 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
new file mode 100644
index 0000000..15ce154
--- /dev/null
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -0,0 +1,629 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="InterchangeDetail">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import { getDictByCode } from '@/api/system/dict'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  measureContent: '', // 检定项目
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+})// 表单
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: string, callback: Function) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '要求样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 检定方式
+  getDictByCode('measureType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
+}
+getDict()
+
+// 获取检定记录
+const fetchMeasureRecords = (query = null) => {
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
+}
+
+// 获取检定证书
+const fetchCertifications = (query = null) => {
+  if (pageType.value === 'detail') {
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
+  }
+}
+
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 获取详细信息
+const getInfo = () => {
+  getSapmleDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                >
+                  <template v-if="pageType !== 'detail'" #append>
+                    <el-button size="small" @click="customerNoFocus">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="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="校检类别:">
+                <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="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电源电压:" prop="powerVoltage">
+                <el-select
+                  v-model="dataForm.powerVoltage"
+                  :placeholder="pageType === 'detail' ? '' : '请选择电源电压'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of powerVoltageList" :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="measurePeriod">
+                <el-input
+                  v-model="dataForm.measurePeriod"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="检定日期:">
+                <el-date-picker
+                  v-model="dataForm.measureLastTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="有效日期:">
+                <el-date-picker
+                  v-model="dataForm.validDeadline"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.measureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  disabled
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="检定项目:" prop="measureContent">
+                <el-input
+                  v-model="dataForm.measureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index b4a9d9c..f6c0768 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -49,12 +49,12 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
-  { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
+  { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
@@ -62,7 +62,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
@@ -359,7 +359,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.sampleId}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.sampleId}`)
 }
 
 onMounted(async () => {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 1ba8293..2eed09b 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -39,6 +39,7 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -95,8 +96,8 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
-  { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'specialRequire', align: 'center' },
+  { text: '外观', value: 'remark', align: 'center' },
+  { text: '检定要求', value: 'measureContent', align: 'center' },
 ])
 
 // 签章查询数据
@@ -228,6 +229,7 @@
     dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    list.value = []
   }
 }
 
@@ -282,6 +284,14 @@
     })
     return
   }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -427,9 +437,9 @@
           >
             <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"
+                    v-model="dataForm.orderNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index a657382..b3089b4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,6 +27,7 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index d35962f..79a112a 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -159,7 +159,15 @@
         :page-sizes="[5]"
         @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>
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
           确定

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
new file mode 100644
index 0000000..15ce154
--- /dev/null
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -0,0 +1,629 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="InterchangeDetail">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import { getDictByCode } from '@/api/system/dict'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  measureContent: '', // 检定项目
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+})// 表单
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: string, callback: Function) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '要求样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 检定方式
+  getDictByCode('measureType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
+}
+getDict()
+
+// 获取检定记录
+const fetchMeasureRecords = (query = null) => {
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
+}
+
+// 获取检定证书
+const fetchCertifications = (query = null) => {
+  if (pageType.value === 'detail') {
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
+  }
+}
+
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 获取详细信息
+const getInfo = () => {
+  getSapmleDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                >
+                  <template v-if="pageType !== 'detail'" #append>
+                    <el-button size="small" @click="customerNoFocus">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="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="校检类别:">
+                <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="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电源电压:" prop="powerVoltage">
+                <el-select
+                  v-model="dataForm.powerVoltage"
+                  :placeholder="pageType === 'detail' ? '' : '请选择电源电压'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of powerVoltageList" :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="measurePeriod">
+                <el-input
+                  v-model="dataForm.measurePeriod"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="检定日期:">
+                <el-date-picker
+                  v-model="dataForm.measureLastTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="有效日期:">
+                <el-date-picker
+                  v-model="dataForm.validDeadline"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.measureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  disabled
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="检定项目:" prop="measureContent">
+                <el-input
+                  v-model="dataForm.measureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index b4a9d9c..f6c0768 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -49,12 +49,12 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
-  { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
+  { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
@@ -62,7 +62,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
@@ -359,7 +359,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.sampleId}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.sampleId}`)
 }
 
 onMounted(async () => {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 1ba8293..2eed09b 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -39,6 +39,7 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -95,8 +96,8 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
-  { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'specialRequire', align: 'center' },
+  { text: '外观', value: 'remark', align: 'center' },
+  { text: '检定要求', value: 'measureContent', align: 'center' },
 ])
 
 // 签章查询数据
@@ -228,6 +229,7 @@
     dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    list.value = []
   }
 }
 
@@ -282,6 +284,14 @@
     })
     return
   }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -427,9 +437,9 @@
           >
             <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"
+                    v-model="dataForm.orderNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index a657382..b3089b4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,6 +27,7 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index d35962f..79a112a 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -159,7 +159,15 @@
         :page-sizes="[5]"
         @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>
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
           确定
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index c087472..3e19b31 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,7 @@
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const isReceived = ref(false) // 样品状态是否已接收
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const ruleFormRef = ref()
@@ -90,6 +91,10 @@
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
+  if ($route.params.status) {
+    isReceived.value = $route.params.status === '2'
+    console.log('样品砖淘', isReceived.value)
+  }
 }
 
 // 获取字典值
@@ -417,7 +422,7 @@
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col><el-col :span="8">
@@ -426,7 +431,7 @@
                     v-model="dataForm.delivererTel"
                     :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -440,7 +445,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -452,7 +457,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -466,7 +471,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -476,14 +481,16 @@
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
-                    style="position: relative;"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  />
-                  <el-button v-if="pageType !== 'detail'" class="selectBtn" size="mini" @click="customerNoFocus">
-                    选择
-                  </el-button>
+                  >
+                    <template v-if="pageType !== 'detail' && !isReceived" #append>
+                      <el-button size="small" @click="customerNoFocus">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -522,7 +529,7 @@
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="证书类别:" prop="certifications">
-                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
                     <el-option
                       v-for="i in certificationsMap"
                       :key="i.value"
@@ -553,7 +560,7 @@
                     type="textarea"
                     autosize
                     :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     :class="{ 'detail-input': pageType === 'detail' }"
                   />
                 </el-form-item>
@@ -566,7 +573,7 @@
                   <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
                   <span v-else-if="pageType === 'detail'">无</span>
                   <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  <el-button v-if="pageType !== 'detail' && !isReceived" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
                     {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
                   </el-button>
                 </el-form-item>

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
new file mode 100644
index 0000000..15ce154
--- /dev/null
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -0,0 +1,629 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="InterchangeDetail">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import { getDictByCode } from '@/api/system/dict'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  measureContent: '', // 检定项目
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+})// 表单
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: string, callback: Function) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '要求样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 检定方式
+  getDictByCode('measureType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
+}
+getDict()
+
+// 获取检定记录
+const fetchMeasureRecords = (query = null) => {
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
+}
+
+// 获取检定证书
+const fetchCertifications = (query = null) => {
+  if (pageType.value === 'detail') {
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
+  }
+}
+
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 获取详细信息
+const getInfo = () => {
+  getSapmleDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                >
+                  <template v-if="pageType !== 'detail'" #append>
+                    <el-button size="small" @click="customerNoFocus">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="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="校检类别:">
+                <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="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电源电压:" prop="powerVoltage">
+                <el-select
+                  v-model="dataForm.powerVoltage"
+                  :placeholder="pageType === 'detail' ? '' : '请选择电源电压'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of powerVoltageList" :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="measurePeriod">
+                <el-input
+                  v-model="dataForm.measurePeriod"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="检定日期:">
+                <el-date-picker
+                  v-model="dataForm.measureLastTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="有效日期:">
+                <el-date-picker
+                  v-model="dataForm.validDeadline"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.measureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  disabled
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="检定项目:" prop="measureContent">
+                <el-input
+                  v-model="dataForm.measureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index b4a9d9c..f6c0768 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -49,12 +49,12 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
-  { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
+  { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
@@ -62,7 +62,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
@@ -359,7 +359,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.sampleId}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.sampleId}`)
 }
 
 onMounted(async () => {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 1ba8293..2eed09b 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -39,6 +39,7 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -95,8 +96,8 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
-  { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'specialRequire', align: 'center' },
+  { text: '外观', value: 'remark', align: 'center' },
+  { text: '检定要求', value: 'measureContent', align: 'center' },
 ])
 
 // 签章查询数据
@@ -228,6 +229,7 @@
     dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    list.value = []
   }
 }
 
@@ -282,6 +284,14 @@
     })
     return
   }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -427,9 +437,9 @@
           >
             <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"
+                    v-model="dataForm.orderNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index a657382..b3089b4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,6 +27,7 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index d35962f..79a112a 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -159,7 +159,15 @@
         :page-sizes="[5]"
         @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>
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
           确定
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index c087472..3e19b31 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,7 @@
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const isReceived = ref(false) // 样品状态是否已接收
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const ruleFormRef = ref()
@@ -90,6 +91,10 @@
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
+  if ($route.params.status) {
+    isReceived.value = $route.params.status === '2'
+    console.log('样品砖淘', isReceived.value)
+  }
 }
 
 // 获取字典值
@@ -417,7 +422,7 @@
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col><el-col :span="8">
@@ -426,7 +431,7 @@
                     v-model="dataForm.delivererTel"
                     :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -440,7 +445,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -452,7 +457,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -466,7 +471,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -476,14 +481,16 @@
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
-                    style="position: relative;"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  />
-                  <el-button v-if="pageType !== 'detail'" class="selectBtn" size="mini" @click="customerNoFocus">
-                    选择
-                  </el-button>
+                  >
+                    <template v-if="pageType !== 'detail' && !isReceived" #append>
+                      <el-button size="small" @click="customerNoFocus">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -522,7 +529,7 @@
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="证书类别:" prop="certifications">
-                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
                     <el-option
                       v-for="i in certificationsMap"
                       :key="i.value"
@@ -553,7 +560,7 @@
                     type="textarea"
                     autosize
                     :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     :class="{ 'detail-input': pageType === 'detail' }"
                   />
                 </el-form-item>
@@ -566,7 +573,7 @@
                   <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
                   <span v-else-if="pageType === 'detail'">无</span>
                   <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  <el-button v-if="pageType !== 'detail' && !isReceived" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
                     {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
                   </el-button>
                 </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fa8e6b0..d340091 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -260,7 +260,7 @@
   console.log(row)
 
   $router.push({
-    path: `/schedule/order/${pageType}/${row.id}`,
+    path: `/schedule/order/${pageType}/${row.id}/${row.status}`,
     // query: {
     //   statusName: row.statusName,
     // },

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
new file mode 100644
index 0000000..15ce154
--- /dev/null
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -0,0 +1,629 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="InterchangeDetail">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import { getDictByCode } from '@/api/system/dict'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  measureContent: '', // 检定项目
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+})// 表单
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: string, callback: Function) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '要求样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 检定方式
+  getDictByCode('measureType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
+}
+getDict()
+
+// 获取检定记录
+const fetchMeasureRecords = (query = null) => {
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
+}
+
+// 获取检定证书
+const fetchCertifications = (query = null) => {
+  if (pageType.value === 'detail') {
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
+  }
+}
+
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 获取详细信息
+const getInfo = () => {
+  getSapmleDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                >
+                  <template v-if="pageType !== 'detail'" #append>
+                    <el-button size="small" @click="customerNoFocus">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="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="校检类别:">
+                <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="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电源电压:" prop="powerVoltage">
+                <el-select
+                  v-model="dataForm.powerVoltage"
+                  :placeholder="pageType === 'detail' ? '' : '请选择电源电压'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of powerVoltageList" :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="measurePeriod">
+                <el-input
+                  v-model="dataForm.measurePeriod"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="检定日期:">
+                <el-date-picker
+                  v-model="dataForm.measureLastTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="有效日期:">
+                <el-date-picker
+                  v-model="dataForm.validDeadline"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.measureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  disabled
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="检定项目:" prop="measureContent">
+                <el-input
+                  v-model="dataForm.measureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index b4a9d9c..f6c0768 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -49,12 +49,12 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
-  { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
+  { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
@@ -62,7 +62,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
@@ -359,7 +359,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.sampleId}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.sampleId}`)
 }
 
 onMounted(async () => {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 1ba8293..2eed09b 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -39,6 +39,7 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -95,8 +96,8 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
-  { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'specialRequire', align: 'center' },
+  { text: '外观', value: 'remark', align: 'center' },
+  { text: '检定要求', value: 'measureContent', align: 'center' },
 ])
 
 // 签章查询数据
@@ -228,6 +229,7 @@
     dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    list.value = []
   }
 }
 
@@ -282,6 +284,14 @@
     })
     return
   }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -427,9 +437,9 @@
           >
             <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"
+                    v-model="dataForm.orderNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index a657382..b3089b4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,6 +27,7 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index d35962f..79a112a 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -159,7 +159,15 @@
         :page-sizes="[5]"
         @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>
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
           确定
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index c087472..3e19b31 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,7 @@
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const isReceived = ref(false) // 样品状态是否已接收
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const ruleFormRef = ref()
@@ -90,6 +91,10 @@
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
+  if ($route.params.status) {
+    isReceived.value = $route.params.status === '2'
+    console.log('样品砖淘', isReceived.value)
+  }
 }
 
 // 获取字典值
@@ -417,7 +422,7 @@
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col><el-col :span="8">
@@ -426,7 +431,7 @@
                     v-model="dataForm.delivererTel"
                     :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -440,7 +445,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -452,7 +457,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -466,7 +471,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -476,14 +481,16 @@
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
-                    style="position: relative;"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  />
-                  <el-button v-if="pageType !== 'detail'" class="selectBtn" size="mini" @click="customerNoFocus">
-                    选择
-                  </el-button>
+                  >
+                    <template v-if="pageType !== 'detail' && !isReceived" #append>
+                      <el-button size="small" @click="customerNoFocus">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -522,7 +529,7 @@
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="证书类别:" prop="certifications">
-                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
                     <el-option
                       v-for="i in certificationsMap"
                       :key="i.value"
@@ -553,7 +560,7 @@
                     type="textarea"
                     autosize
                     :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     :class="{ 'detail-input': pageType === 'detail' }"
                   />
                 </el-form-item>
@@ -566,7 +573,7 @@
                   <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
                   <span v-else-if="pageType === 'detail'">无</span>
                   <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  <el-button v-if="pageType !== 'detail' && !isReceived" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
                     {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
                   </el-button>
                 </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fa8e6b0..d340091 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -260,7 +260,7 @@
   console.log(row)
 
   $router.push({
-    path: `/schedule/order/${pageType}/${row.id}`,
+    path: `/schedule/order/${pageType}/${row.id}/${row.status}`,
     // query: {
     //   statusName: row.statusName,
     // },
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index cbc4a70..0ada9c2 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -97,7 +97,8 @@
   processResult: string // 处理结果（设备领用、借用处理结果）
   remark: string // 备注
   taskId: string // 任务id（同意、驳回等操作使用）
-  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  checkDate: string | Date // 检修时间
+  time: string // 检修日期
   updateTime: string // 更新时间
   version: string // 版本号
 }
@@ -167,3 +168,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 设备检修列表表头类型
+export interface IColumnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
new file mode 100644
index 0000000..15ce154
--- /dev/null
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -0,0 +1,629 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="InterchangeDetail">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import { getDictByCode } from '@/api/system/dict'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  measureContent: '', // 检定项目
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+})// 表单
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: string, callback: Function) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '要求样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 检定方式
+  getDictByCode('measureType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
+}
+getDict()
+
+// 获取检定记录
+const fetchMeasureRecords = (query = null) => {
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
+}
+
+// 获取检定证书
+const fetchCertifications = (query = null) => {
+  if (pageType.value === 'detail') {
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
+  }
+}
+
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 获取详细信息
+const getInfo = () => {
+  getSapmleDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                >
+                  <template v-if="pageType !== 'detail'" #append>
+                    <el-button size="small" @click="customerNoFocus">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="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="校检类别:">
+                <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="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电源电压:" prop="powerVoltage">
+                <el-select
+                  v-model="dataForm.powerVoltage"
+                  :placeholder="pageType === 'detail' ? '' : '请选择电源电压'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of powerVoltageList" :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="measurePeriod">
+                <el-input
+                  v-model="dataForm.measurePeriod"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="检定日期:">
+                <el-date-picker
+                  v-model="dataForm.measureLastTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="有效日期:">
+                <el-date-picker
+                  v-model="dataForm.validDeadline"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.measureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  disabled
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="检定项目:" prop="measureContent">
+                <el-input
+                  v-model="dataForm.measureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index b4a9d9c..f6c0768 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -49,12 +49,12 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
-  { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
+  { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
@@ -62,7 +62,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
@@ -359,7 +359,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.sampleId}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.sampleId}`)
 }
 
 onMounted(async () => {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 1ba8293..2eed09b 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -39,6 +39,7 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -95,8 +96,8 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
-  { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'specialRequire', align: 'center' },
+  { text: '外观', value: 'remark', align: 'center' },
+  { text: '检定要求', value: 'measureContent', align: 'center' },
 ])
 
 // 签章查询数据
@@ -228,6 +229,7 @@
     dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    list.value = []
   }
 }
 
@@ -282,6 +284,14 @@
     })
     return
   }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -427,9 +437,9 @@
           >
             <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"
+                    v-model="dataForm.orderNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index a657382..b3089b4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,6 +27,7 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index d35962f..79a112a 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -159,7 +159,15 @@
         :page-sizes="[5]"
         @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>
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
           确定
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index c087472..3e19b31 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,7 @@
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const isReceived = ref(false) // 样品状态是否已接收
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const ruleFormRef = ref()
@@ -90,6 +91,10 @@
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
+  if ($route.params.status) {
+    isReceived.value = $route.params.status === '2'
+    console.log('样品砖淘', isReceived.value)
+  }
 }
 
 // 获取字典值
@@ -417,7 +422,7 @@
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col><el-col :span="8">
@@ -426,7 +431,7 @@
                     v-model="dataForm.delivererTel"
                     :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -440,7 +445,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -452,7 +457,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -466,7 +471,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -476,14 +481,16 @@
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
-                    style="position: relative;"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  />
-                  <el-button v-if="pageType !== 'detail'" class="selectBtn" size="mini" @click="customerNoFocus">
-                    选择
-                  </el-button>
+                  >
+                    <template v-if="pageType !== 'detail' && !isReceived" #append>
+                      <el-button size="small" @click="customerNoFocus">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -522,7 +529,7 @@
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="证书类别:" prop="certifications">
-                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
                     <el-option
                       v-for="i in certificationsMap"
                       :key="i.value"
@@ -553,7 +560,7 @@
                     type="textarea"
                     autosize
                     :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     :class="{ 'detail-input': pageType === 'detail' }"
                   />
                 </el-form-item>
@@ -566,7 +573,7 @@
                   <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
                   <span v-else-if="pageType === 'detail'">无</span>
                   <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  <el-button v-if="pageType !== 'detail' && !isReceived" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
                     {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
                   </el-button>
                 </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fa8e6b0..d340091 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -260,7 +260,7 @@
   console.log(row)
 
   $router.push({
-    path: `/schedule/order/${pageType}/${row.id}`,
+    path: `/schedule/order/${pageType}/${row.id}/${row.status}`,
     // query: {
     //   statusName: row.statusName,
     // },
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index cbc4a70..0ada9c2 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -97,7 +97,8 @@
   processResult: string // 处理结果（设备领用、借用处理结果）
   remark: string // 备注
   taskId: string // 任务id（同意、驳回等操作使用）
-  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  checkDate: string | Date // 检修时间
+  time: string // 检修日期
   updateTime: string // 更新时间
   version: string // 版本号
 }
@@ -167,3 +168,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 设备检修列表表头类型
+export interface IColumnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index eb2505d..e7f14c6 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -1,4 +1,4 @@
-<!-- 用户列表弹窗 -->
+<!-- 选择设备检修列表 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
@@ -37,6 +37,7 @@
   {
     text: '检修申请编号',
     value: 'applyNo',
+    width: '160',
     align: 'center',
   },
   {
@@ -57,6 +58,7 @@
   {
     text: '检修时间',
     value: 'time',
+    width: '150',
     align: 'center',
   },
   {
@@ -70,9 +72,7 @@
     align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,7 +83,7 @@
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
-  // 获取设备检修列表已完成
+  // 获取设备检修列表
   getEquipmentApplyList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
@@ -97,7 +97,7 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    approvalStatus: '4',
+    approvalStatus: '4', // 已通过
     formId: SCHEDULE.DEVICE_FIX_APPROVAL,
     applyName: '',
     applyNo: '',
@@ -113,8 +113,8 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  // selectTreeRef.value.clearSelected()
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -126,8 +126,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 确认
+const confirm = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
@@ -135,7 +135,7 @@
     reset()
   }
   else {
-    ElMessage.warning('请先选择人员')
+    ElMessage.warning('请选择')
   }
 }
 // 取消
@@ -154,7 +154,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -171,7 +171,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
@@ -181,7 +186,7 @@
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirm">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
new file mode 100644
index 0000000..15ce154
--- /dev/null
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -0,0 +1,629 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="InterchangeDetail">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import { getDictByCode } from '@/api/system/dict'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  measureContent: '', // 检定项目
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+})// 表单
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: string, callback: Function) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '要求样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 检定方式
+  getDictByCode('measureType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
+}
+getDict()
+
+// 获取检定记录
+const fetchMeasureRecords = (query = null) => {
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
+}
+
+// 获取检定证书
+const fetchCertifications = (query = null) => {
+  if (pageType.value === 'detail') {
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
+  }
+}
+
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 获取详细信息
+const getInfo = () => {
+  getSapmleDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                >
+                  <template v-if="pageType !== 'detail'" #append>
+                    <el-button size="small" @click="customerNoFocus">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="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="校检类别:">
+                <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="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电源电压:" prop="powerVoltage">
+                <el-select
+                  v-model="dataForm.powerVoltage"
+                  :placeholder="pageType === 'detail' ? '' : '请选择电源电压'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of powerVoltageList" :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="measurePeriod">
+                <el-input
+                  v-model="dataForm.measurePeriod"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="检定日期:">
+                <el-date-picker
+                  v-model="dataForm.measureLastTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="有效日期:">
+                <el-date-picker
+                  v-model="dataForm.validDeadline"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.measureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  disabled
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="检定项目:" prop="measureContent">
+                <el-input
+                  v-model="dataForm.measureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index b4a9d9c..f6c0768 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -49,12 +49,12 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
-  { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
+  { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
@@ -62,7 +62,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
@@ -359,7 +359,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.sampleId}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.sampleId}`)
 }
 
 onMounted(async () => {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 1ba8293..2eed09b 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -39,6 +39,7 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -95,8 +96,8 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
-  { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'specialRequire', align: 'center' },
+  { text: '外观', value: 'remark', align: 'center' },
+  { text: '检定要求', value: 'measureContent', align: 'center' },
 ])
 
 // 签章查询数据
@@ -228,6 +229,7 @@
     dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    list.value = []
   }
 }
 
@@ -282,6 +284,14 @@
     })
     return
   }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -427,9 +437,9 @@
           >
             <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"
+                    v-model="dataForm.orderNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index a657382..b3089b4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,6 +27,7 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index d35962f..79a112a 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -159,7 +159,15 @@
         :page-sizes="[5]"
         @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>
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
           确定
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index c087472..3e19b31 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,7 @@
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const isReceived = ref(false) // 样品状态是否已接收
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const ruleFormRef = ref()
@@ -90,6 +91,10 @@
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
+  if ($route.params.status) {
+    isReceived.value = $route.params.status === '2'
+    console.log('样品砖淘', isReceived.value)
+  }
 }
 
 // 获取字典值
@@ -417,7 +422,7 @@
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col><el-col :span="8">
@@ -426,7 +431,7 @@
                     v-model="dataForm.delivererTel"
                     :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -440,7 +445,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -452,7 +457,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -466,7 +471,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -476,14 +481,16 @@
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
-                    style="position: relative;"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  />
-                  <el-button v-if="pageType !== 'detail'" class="selectBtn" size="mini" @click="customerNoFocus">
-                    选择
-                  </el-button>
+                  >
+                    <template v-if="pageType !== 'detail' && !isReceived" #append>
+                      <el-button size="small" @click="customerNoFocus">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -522,7 +529,7 @@
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="证书类别:" prop="certifications">
-                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
                     <el-option
                       v-for="i in certificationsMap"
                       :key="i.value"
@@ -553,7 +560,7 @@
                     type="textarea"
                     autosize
                     :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     :class="{ 'detail-input': pageType === 'detail' }"
                   />
                 </el-form-item>
@@ -566,7 +573,7 @@
                   <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
                   <span v-else-if="pageType === 'detail'">无</span>
                   <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  <el-button v-if="pageType !== 'detail' && !isReceived" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
                     {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
                   </el-button>
                 </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fa8e6b0..d340091 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -260,7 +260,7 @@
   console.log(row)
 
   $router.push({
-    path: `/schedule/order/${pageType}/${row.id}`,
+    path: `/schedule/order/${pageType}/${row.id}/${row.status}`,
     // query: {
     //   statusName: row.statusName,
     // },
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index cbc4a70..0ada9c2 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -97,7 +97,8 @@
   processResult: string // 处理结果（设备领用、借用处理结果）
   remark: string // 备注
   taskId: string // 任务id（同意、驳回等操作使用）
-  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  checkDate: string | Date // 检修时间
+  time: string // 检修日期
   updateTime: string // 更新时间
   version: string // 版本号
 }
@@ -167,3 +168,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 设备检修列表表头类型
+export interface IColumnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index eb2505d..e7f14c6 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -1,4 +1,4 @@
-<!-- 用户列表弹窗 -->
+<!-- 选择设备检修列表 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
@@ -37,6 +37,7 @@
   {
     text: '检修申请编号',
     value: 'applyNo',
+    width: '160',
     align: 'center',
   },
   {
@@ -57,6 +58,7 @@
   {
     text: '检修时间',
     value: 'time',
+    width: '150',
     align: 'center',
   },
   {
@@ -70,9 +72,7 @@
     align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,7 +83,7 @@
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
-  // 获取设备检修列表已完成
+  // 获取设备检修列表
   getEquipmentApplyList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
@@ -97,7 +97,7 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    approvalStatus: '4',
+    approvalStatus: '4', // 已通过
     formId: SCHEDULE.DEVICE_FIX_APPROVAL,
     applyName: '',
     applyNo: '',
@@ -113,8 +113,8 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  // selectTreeRef.value.clearSelected()
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -126,8 +126,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 确认
+const confirm = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
@@ -135,7 +135,7 @@
     reset()
   }
   else {
-    ElMessage.warning('请先选择人员')
+    ElMessage.warning('请选择')
   }
 }
 // 取消
@@ -154,7 +154,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -171,7 +171,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
@@ -181,7 +186,7 @@
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirm">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 20b635c..225f9a7 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,16 +1,21 @@
+<!-- 设备保养验收单列表 -->
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
 import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/measure/plan'
-import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, exportCheckList, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
@@ -28,6 +33,7 @@
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 24
 })
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
@@ -50,15 +56,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
-    width: '160',
+    width: '190',
   },
   {
     text: '验收单名称',
@@ -82,7 +86,7 @@
   },
   {
     text: '检修日期',
-    value: 'createTime',
+    value: 'checkDate',
     align: 'center',
     width: '120',
   },
@@ -94,14 +98,12 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 装载时间数组
 const checkTime = ref<string>('')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.checkStartDate = checkTime.value[0] || ''
   listQuery.value.checkEndDate = checkTime.value[1] || ''
@@ -111,7 +113,12 @@
     listQuery.value.offset = 1
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        checkDate: item.checkDate ? dayjs(item.checkDate).format('YYYY-MM-DD') : '',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
@@ -123,7 +130,7 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -145,12 +152,20 @@
     })
   })
 }
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '取消',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -160,16 +175,12 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
@@ -204,15 +215,39 @@
 const add = () => {
   $router.push('maintenanceCheckList/add')
 }
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (list.value.length > 0) {
+    const params = {
+      approvalStatus: props.status, // 审批状态
+      formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+      applyName: '', // 审批名称
+      applyNo: '', // 审批编号
+      applyType: '9', // 审批类型
+      businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+      checkApplyNo: '', // 检修申请编号
+      checkEndDate: '', // 检修结束时间
+      checkStartDate: '', // 检修开始时间
+      createUser: '', //  创建人
+      overhaulPerson: '', // 检修保养人
+      offset: 1, // 当前页
+      limit: 20, // 一页多少条
+      ids: checkoutList.value,
+    }
+    exportCheckList(params).then((res: any) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备检修保养验收单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -228,20 +263,9 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
+
 // 提交
 const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -260,10 +284,7 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -279,7 +300,8 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
+      $router.push(`maintenanceCheckList/edit/${row.id}/${row.approvalStatusName}/${row.processId}`)
+      // $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -304,9 +326,9 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceCheckListApprovalMenu', newVal)
     fetchData(false)
-  },
-  { immediate: true })
+  })
 
 // 打印列表
 function printList() {
@@ -338,6 +360,17 @@
   cancel: '/device/maintenance/checkList/cancel', // 取消
   delete: '/device/maintenance/checkList/delete', // 删除
 }
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceCheckListApprovalMenu')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceCheckListApprovalMenu')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -377,25 +410,32 @@
       <search-item>
         <el-date-picker
           v-model="checkTime"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="检查日期开始时间"
-          end-placeholder="检查日期结束时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="检修开始日期"
+          end-placeholder="检修结束日期"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
new file mode 100644
index 0000000..15ce154
--- /dev/null
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -0,0 +1,629 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="InterchangeDetail">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import { getDictByCode } from '@/api/system/dict'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  measureContent: '', // 检定项目
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+})// 表单
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: string, callback: Function) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '要求样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 检定方式
+  getDictByCode('measureType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
+}
+getDict()
+
+// 获取检定记录
+const fetchMeasureRecords = (query = null) => {
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
+}
+
+// 获取检定证书
+const fetchCertifications = (query = null) => {
+  if (pageType.value === 'detail') {
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
+  }
+}
+
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 获取详细信息
+const getInfo = () => {
+  getSapmleDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                >
+                  <template v-if="pageType !== 'detail'" #append>
+                    <el-button size="small" @click="customerNoFocus">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="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="校检类别:">
+                <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="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电源电压:" prop="powerVoltage">
+                <el-select
+                  v-model="dataForm.powerVoltage"
+                  :placeholder="pageType === 'detail' ? '' : '请选择电源电压'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of powerVoltageList" :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="measurePeriod">
+                <el-input
+                  v-model="dataForm.measurePeriod"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="检定日期:">
+                <el-date-picker
+                  v-model="dataForm.measureLastTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="有效日期:">
+                <el-date-picker
+                  v-model="dataForm.validDeadline"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.measureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  disabled
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="检定项目:" prop="measureContent">
+                <el-input
+                  v-model="dataForm.measureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index b4a9d9c..f6c0768 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -49,12 +49,12 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
-  { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
+  { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
@@ -62,7 +62,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
@@ -359,7 +359,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.sampleId}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.sampleId}`)
 }
 
 onMounted(async () => {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 1ba8293..2eed09b 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -39,6 +39,7 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -95,8 +96,8 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
-  { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'specialRequire', align: 'center' },
+  { text: '外观', value: 'remark', align: 'center' },
+  { text: '检定要求', value: 'measureContent', align: 'center' },
 ])
 
 // 签章查询数据
@@ -228,6 +229,7 @@
     dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    list.value = []
   }
 }
 
@@ -282,6 +284,14 @@
     })
     return
   }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -427,9 +437,9 @@
           >
             <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"
+                    v-model="dataForm.orderNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index a657382..b3089b4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,6 +27,7 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index d35962f..79a112a 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -159,7 +159,15 @@
         :page-sizes="[5]"
         @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>
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
           确定
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index c087472..3e19b31 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,7 @@
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const isReceived = ref(false) // 样品状态是否已接收
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const ruleFormRef = ref()
@@ -90,6 +91,10 @@
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
+  if ($route.params.status) {
+    isReceived.value = $route.params.status === '2'
+    console.log('样品砖淘', isReceived.value)
+  }
 }
 
 // 获取字典值
@@ -417,7 +422,7 @@
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col><el-col :span="8">
@@ -426,7 +431,7 @@
                     v-model="dataForm.delivererTel"
                     :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -440,7 +445,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -452,7 +457,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -466,7 +471,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -476,14 +481,16 @@
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
-                    style="position: relative;"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  />
-                  <el-button v-if="pageType !== 'detail'" class="selectBtn" size="mini" @click="customerNoFocus">
-                    选择
-                  </el-button>
+                  >
+                    <template v-if="pageType !== 'detail' && !isReceived" #append>
+                      <el-button size="small" @click="customerNoFocus">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -522,7 +529,7 @@
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="证书类别:" prop="certifications">
-                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
                     <el-option
                       v-for="i in certificationsMap"
                       :key="i.value"
@@ -553,7 +560,7 @@
                     type="textarea"
                     autosize
                     :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     :class="{ 'detail-input': pageType === 'detail' }"
                   />
                 </el-form-item>
@@ -566,7 +573,7 @@
                   <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
                   <span v-else-if="pageType === 'detail'">无</span>
                   <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  <el-button v-if="pageType !== 'detail' && !isReceived" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
                     {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
                   </el-button>
                 </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fa8e6b0..d340091 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -260,7 +260,7 @@
   console.log(row)
 
   $router.push({
-    path: `/schedule/order/${pageType}/${row.id}`,
+    path: `/schedule/order/${pageType}/${row.id}/${row.status}`,
     // query: {
     //   statusName: row.statusName,
     // },
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index cbc4a70..0ada9c2 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -97,7 +97,8 @@
   processResult: string // 处理结果（设备领用、借用处理结果）
   remark: string // 备注
   taskId: string // 任务id（同意、驳回等操作使用）
-  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  checkDate: string | Date // 检修时间
+  time: string // 检修日期
   updateTime: string // 更新时间
   version: string // 版本号
 }
@@ -167,3 +168,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 设备检修列表表头类型
+export interface IColumnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index eb2505d..e7f14c6 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -1,4 +1,4 @@
-<!-- 用户列表弹窗 -->
+<!-- 选择设备检修列表 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
@@ -37,6 +37,7 @@
   {
     text: '检修申请编号',
     value: 'applyNo',
+    width: '160',
     align: 'center',
   },
   {
@@ -57,6 +58,7 @@
   {
     text: '检修时间',
     value: 'time',
+    width: '150',
     align: 'center',
   },
   {
@@ -70,9 +72,7 @@
     align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,7 +83,7 @@
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
-  // 获取设备检修列表已完成
+  // 获取设备检修列表
   getEquipmentApplyList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
@@ -97,7 +97,7 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    approvalStatus: '4',
+    approvalStatus: '4', // 已通过
     formId: SCHEDULE.DEVICE_FIX_APPROVAL,
     applyName: '',
     applyNo: '',
@@ -113,8 +113,8 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  // selectTreeRef.value.clearSelected()
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -126,8 +126,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 确认
+const confirm = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
@@ -135,7 +135,7 @@
     reset()
   }
   else {
-    ElMessage.warning('请先选择人员')
+    ElMessage.warning('请选择')
   }
 }
 // 取消
@@ -154,7 +154,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -171,7 +171,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
@@ -181,7 +186,7 @@
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirm">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 20b635c..225f9a7 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,16 +1,21 @@
+<!-- 设备保养验收单列表 -->
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
 import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/measure/plan'
-import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, exportCheckList, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
@@ -28,6 +33,7 @@
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 24
 })
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
@@ -50,15 +56,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
-    width: '160',
+    width: '190',
   },
   {
     text: '验收单名称',
@@ -82,7 +86,7 @@
   },
   {
     text: '检修日期',
-    value: 'createTime',
+    value: 'checkDate',
     align: 'center',
     width: '120',
   },
@@ -94,14 +98,12 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 装载时间数组
 const checkTime = ref<string>('')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.checkStartDate = checkTime.value[0] || ''
   listQuery.value.checkEndDate = checkTime.value[1] || ''
@@ -111,7 +113,12 @@
     listQuery.value.offset = 1
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        checkDate: item.checkDate ? dayjs(item.checkDate).format('YYYY-MM-DD') : '',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
@@ -123,7 +130,7 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -145,12 +152,20 @@
     })
   })
 }
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '取消',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -160,16 +175,12 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
@@ -204,15 +215,39 @@
 const add = () => {
   $router.push('maintenanceCheckList/add')
 }
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (list.value.length > 0) {
+    const params = {
+      approvalStatus: props.status, // 审批状态
+      formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+      applyName: '', // 审批名称
+      applyNo: '', // 审批编号
+      applyType: '9', // 审批类型
+      businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+      checkApplyNo: '', // 检修申请编号
+      checkEndDate: '', // 检修结束时间
+      checkStartDate: '', // 检修开始时间
+      createUser: '', //  创建人
+      overhaulPerson: '', // 检修保养人
+      offset: 1, // 当前页
+      limit: 20, // 一页多少条
+      ids: checkoutList.value,
+    }
+    exportCheckList(params).then((res: any) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备检修保养验收单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -228,20 +263,9 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
+
 // 提交
 const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -260,10 +284,7 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -279,7 +300,8 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
+      $router.push(`maintenanceCheckList/edit/${row.id}/${row.approvalStatusName}/${row.processId}`)
+      // $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -304,9 +326,9 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceCheckListApprovalMenu', newVal)
     fetchData(false)
-  },
-  { immediate: true })
+  })
 
 // 打印列表
 function printList() {
@@ -338,6 +360,17 @@
   cancel: '/device/maintenance/checkList/cancel', // 取消
   delete: '/device/maintenance/checkList/delete', // 删除
 }
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceCheckListApprovalMenu')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceCheckListApprovalMenu')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -377,25 +410,32 @@
       <search-item>
         <el-date-picker
           v-model="checkTime"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="检查日期开始时间"
-          end-placeholder="检查日期结束时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="检修开始日期"
+          end-placeholder="检修结束日期"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 18879cc..e59af7c 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,18 +1,19 @@
+<!-- 设备保养验收单详情 -->
 <script lang="ts" setup name="ListApprovalAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IlistApprovalAddTypes } from '../checkList_interface'
+import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-const loading = ref(false) // 表单加载状态
+
 const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
+const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   add: '新建',
@@ -21,24 +22,28 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-console.log($route.meta.title)
+
+// ------------------------------------------- 路由参数 ----------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else if (pageType.value === 'edit') {
+  //   buttonArray.value = ['提交', '保存']
+  // }
+  // else {
+  //   buttonArray.value = ['提交', '保存']
+  // }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
+  if ($route.params.approvalStatusName) {
+    approvalStatusName.value = $route.params.approvalStatusName as string
+  }
 }
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单-包括表格数据
 const formInline = ref<IlistApprovalAddTypes>({
   acceptanceCheckId: '', // 检修申请id
   applyDesc: '', // 申请说明
@@ -76,52 +81,22 @@
   processResult: '', // 处理结果（设备领用、借用处理结果）
   remark: '', // 备注
   taskId: '', // 任务id（同意、驳回等操作使用）
-  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  checkDate: new Date(), // 检修日期
+  time: '', // 需要传的参数，检修日期
   updateTime: '', // 更新时间
   version: '', // 版本号
 })
-// 审批弹窗信息收集类型
-interface checkIdObjectType {
-  applyName: string
-  applyPersonName: string
-  time: string
-  applyNo: string
-}
+
 // 获取到检修申请列表数据
-const checkIdObject = ref<checkIdObjectType>({
+const checkIdObject = ref({
   applyName: '',
   applyPersonName: '',
-  time: '',
+  checkDate: '',
   applyNo: '',
 })
-// 检修设备列表数据
-const list = ref<object[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  width?: string
-  required: boolean
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
+
+// 设备检修列表
+const columns = ref<IColumnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
@@ -132,6 +107,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: false,
   },
   {
@@ -149,23 +125,19 @@
   },
 ])
 const checkListRef = ref()
-// 检修申请编号按钮
+// 点击选择检修申请编号
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 下拉框列表类型
-interface optionsType {
-  name: string
-  id: string
-  value: string
-}
-// 检修结果下拉框
-const options = ref<optionsType[]>([])
 
+// ------------------------------------------ 字典 --------------------------------------
+// 检修结果下拉框
+const options = ref<dictType[]>([])
 // 获取检修结果
 getDictByCode('maintenanceResults').then((response) => {
   options.value = response.data
 })
+// --------------------------------------------------------------------------------------
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -177,7 +149,7 @@
   applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
   acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检修日期不能为空', trigger: ['blur', 'change'] }],
 })
 
 const onFileChange = (event: any) => {
@@ -203,19 +175,19 @@
 // 获取详情信息
 const getInfo = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
+    // Object.keys(res.data).map((item) => {
+    //   if (typeof (res.data[item]) === 'number') {
+    //     res.data[item] = res.data[item].toString()
+    //   }
+    // })
     checkIdObject.value.applyNo = res.data.checkApplyNo
     checkIdObject.value.applyName = res.data.checkApplyName
     formInline.value = res.data
+    formInline.value.equipmentList = res.data.checkList
+    formInline.value.applyType = '9'
   })
 }
-if (pageType.value !== 'add') {
-  getInfo()
-}
+
 const fileRef = ref() // 文件上传input
 
 // 点击上传文件按钮
@@ -229,8 +201,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -240,18 +212,15 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      close()
     })
+  })
 }
 const approvalDialog = ref()
-// 点击数据后的操作按钮
+// 审批操作-同意-驳回-拒绝-取消
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
     case '同意':
@@ -268,122 +237,122 @@
       break
   }
 }
+// 检查表格第几行信息未完善
+const checkEquipmentList = () => {
+  const index = formInline.value.equipmentList.findIndex((item: any) => !item.overhaulResult || !item.overhaulIdea)
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
 // 保存后的id
 const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
-            formInline.value.fileList = []
-          }
+// 保存
+const save = async (formEl: FormInstance | undefined) => {
+  // 检查表格是否存在增加行信息没有完善的情况
+  const result = checkEquipmentList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
+    return
+  }
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        formInline.value.time = formInline.value.checkDate
+        if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data
             }
           })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateAcceptanceCheckInfo(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          if (approvalStatusName.value === '未通过-驳回') {
+            failUpdateAcceptanceCheckInfo(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else { // 草稿箱和已取消
+            updateAcceptanceCheckInfo(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
         }
       })
     }
+  })
+}
+
+// 点击提交
+const submit = () => {
+  if (addId.value === '') {
+    ElMessage.warning('请先保存')
   }
   else {
-    clickBtn(item)
+    submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
   }
 }
 
-// 标准实验室发生改变row类型
-interface objectReturn {
-  id: string
-  applyName: string
-  applyPersonName: string
-  time: string
-  applyNo: string
-  equipmentId: string
-}
-// 选择完负责人的函数
-const confirmPerson = (object: objectReturn) => {
+// 选择完设备检修列表
+const confirmCheckList = (object: any) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
-
   equipmentApplyInfo({ id: object.id }).then((res) => {
-    res.data.equipmentInfoList.map((item: objectReturn) => {
-      if (item.id) {
-        item.equipmentId = item.id
-      }
-      // 如果选择的没有id则就让装置数组置空
-      else {
-        return formInline.value.equipmentList = []
-      }
-    })
-    formInline.value.equipmentList = res.data.equipmentInfoList
+    if (res.data.equipmentInfoList.length) {
+      formInline.value.equipmentList = res.data.equipmentInfoList.map((item: any) => {
+        return {
+          ...item,
+          equipmentId: item.id,
+        }
+      })
+    }
   })
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add' && approvalStatusName.value !== '草稿箱') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
   }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  // 编辑和详情页面获取详情信息
+  if (pageType.value !== 'add') {
+    getInfo() // 获取详情信息
+    getApprovalRecord(formInline.value.processId) // 获取审批流程
+  }
 })
 </script>
 
@@ -391,8 +360,14 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
+        <!-- <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
           {{ item }}
+        </el-button> -->
+        <el-button v-if="pageType === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -465,10 +440,10 @@
           <el-col :span="6">
             <el-form-item
               label="检修日期:"
-              prop="time"
+              prop="checkDate"
             >
               <el-date-picker
-                v-model="formInline.time"
+                v-model="formInline.checkDate"
                 style="width: 100%;"
                 type="date"
                 :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
@@ -497,7 +472,7 @@
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
               <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '更换附件' : '上传' }}
               </el-button>
             </el-form-item>
           </el-col>
@@ -527,22 +502,22 @@
             >
               <el-option
                 v-for="item in options"
-                :key="item.id"
+                :key="item.value"
                 :label="item.name"
-                :value="item.id"
+                :value="item.value"
               />
             </el-select>
           </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 选择用户列表组件 -->
-    <check-list ref="checkListRef" @add="confirmPerson" />
+    <!-- 选择设备检修列表 -->
+    <check-list ref="checkListRef" @add="confirmCheckList" />
   </app-container>
 </template>
 

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
new file mode 100644
index 0000000..15ce154
--- /dev/null
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -0,0 +1,629 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="InterchangeDetail">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import { getDictByCode } from '@/api/system/dict'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  measureContent: '', // 检定项目
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+})// 表单
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: string, callback: Function) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '要求样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 检定方式
+  getDictByCode('measureType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
+}
+getDict()
+
+// 获取检定记录
+const fetchMeasureRecords = (query = null) => {
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
+}
+
+// 获取检定证书
+const fetchCertifications = (query = null) => {
+  if (pageType.value === 'detail') {
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
+  }
+}
+
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 获取详细信息
+const getInfo = () => {
+  getSapmleDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                >
+                  <template v-if="pageType !== 'detail'" #append>
+                    <el-button size="small" @click="customerNoFocus">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="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="校检类别:">
+                <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="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电源电压:" prop="powerVoltage">
+                <el-select
+                  v-model="dataForm.powerVoltage"
+                  :placeholder="pageType === 'detail' ? '' : '请选择电源电压'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of powerVoltageList" :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="measurePeriod">
+                <el-input
+                  v-model="dataForm.measurePeriod"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="检定日期:">
+                <el-date-picker
+                  v-model="dataForm.measureLastTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="有效日期:">
+                <el-date-picker
+                  v-model="dataForm.validDeadline"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.measureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  disabled
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="检定项目:" prop="measureContent">
+                <el-input
+                  v-model="dataForm.measureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index b4a9d9c..f6c0768 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -49,12 +49,12 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
-  { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
+  { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
@@ -62,7 +62,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
@@ -359,7 +359,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.sampleId}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.sampleId}`)
 }
 
 onMounted(async () => {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 1ba8293..2eed09b 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -39,6 +39,7 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -95,8 +96,8 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
-  { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'specialRequire', align: 'center' },
+  { text: '外观', value: 'remark', align: 'center' },
+  { text: '检定要求', value: 'measureContent', align: 'center' },
 ])
 
 // 签章查询数据
@@ -228,6 +229,7 @@
     dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    list.value = []
   }
 }
 
@@ -282,6 +284,14 @@
     })
     return
   }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -427,9 +437,9 @@
           >
             <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"
+                    v-model="dataForm.orderNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index a657382..b3089b4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,6 +27,7 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index d35962f..79a112a 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -159,7 +159,15 @@
         :page-sizes="[5]"
         @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>
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
           确定
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index c087472..3e19b31 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,7 @@
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const isReceived = ref(false) // 样品状态是否已接收
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const ruleFormRef = ref()
@@ -90,6 +91,10 @@
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
+  if ($route.params.status) {
+    isReceived.value = $route.params.status === '2'
+    console.log('样品砖淘', isReceived.value)
+  }
 }
 
 // 获取字典值
@@ -417,7 +422,7 @@
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col><el-col :span="8">
@@ -426,7 +431,7 @@
                     v-model="dataForm.delivererTel"
                     :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -440,7 +445,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -452,7 +457,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -466,7 +471,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -476,14 +481,16 @@
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
-                    style="position: relative;"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  />
-                  <el-button v-if="pageType !== 'detail'" class="selectBtn" size="mini" @click="customerNoFocus">
-                    选择
-                  </el-button>
+                  >
+                    <template v-if="pageType !== 'detail' && !isReceived" #append>
+                      <el-button size="small" @click="customerNoFocus">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -522,7 +529,7 @@
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="证书类别:" prop="certifications">
-                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
                     <el-option
                       v-for="i in certificationsMap"
                       :key="i.value"
@@ -553,7 +560,7 @@
                     type="textarea"
                     autosize
                     :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     :class="{ 'detail-input': pageType === 'detail' }"
                   />
                 </el-form-item>
@@ -566,7 +573,7 @@
                   <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
                   <span v-else-if="pageType === 'detail'">无</span>
                   <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  <el-button v-if="pageType !== 'detail' && !isReceived" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
                     {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
                   </el-button>
                 </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fa8e6b0..d340091 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -260,7 +260,7 @@
   console.log(row)
 
   $router.push({
-    path: `/schedule/order/${pageType}/${row.id}`,
+    path: `/schedule/order/${pageType}/${row.id}/${row.status}`,
     // query: {
     //   statusName: row.statusName,
     // },
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index cbc4a70..0ada9c2 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -97,7 +97,8 @@
   processResult: string // 处理结果（设备领用、借用处理结果）
   remark: string // 备注
   taskId: string // 任务id（同意、驳回等操作使用）
-  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  checkDate: string | Date // 检修时间
+  time: string // 检修日期
   updateTime: string // 更新时间
   version: string // 版本号
 }
@@ -167,3 +168,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 设备检修列表表头类型
+export interface IColumnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index eb2505d..e7f14c6 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -1,4 +1,4 @@
-<!-- 用户列表弹窗 -->
+<!-- 选择设备检修列表 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
@@ -37,6 +37,7 @@
   {
     text: '检修申请编号',
     value: 'applyNo',
+    width: '160',
     align: 'center',
   },
   {
@@ -57,6 +58,7 @@
   {
     text: '检修时间',
     value: 'time',
+    width: '150',
     align: 'center',
   },
   {
@@ -70,9 +72,7 @@
     align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,7 +83,7 @@
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
-  // 获取设备检修列表已完成
+  // 获取设备检修列表
   getEquipmentApplyList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
@@ -97,7 +97,7 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    approvalStatus: '4',
+    approvalStatus: '4', // 已通过
     formId: SCHEDULE.DEVICE_FIX_APPROVAL,
     applyName: '',
     applyNo: '',
@@ -113,8 +113,8 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  // selectTreeRef.value.clearSelected()
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -126,8 +126,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 确认
+const confirm = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
@@ -135,7 +135,7 @@
     reset()
   }
   else {
-    ElMessage.warning('请先选择人员')
+    ElMessage.warning('请选择')
   }
 }
 // 取消
@@ -154,7 +154,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -171,7 +171,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
@@ -181,7 +186,7 @@
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirm">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 20b635c..225f9a7 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,16 +1,21 @@
+<!-- 设备保养验收单列表 -->
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
 import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/measure/plan'
-import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, exportCheckList, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
@@ -28,6 +33,7 @@
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 24
 })
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
@@ -50,15 +56,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
-    width: '160',
+    width: '190',
   },
   {
     text: '验收单名称',
@@ -82,7 +86,7 @@
   },
   {
     text: '检修日期',
-    value: 'createTime',
+    value: 'checkDate',
     align: 'center',
     width: '120',
   },
@@ -94,14 +98,12 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 装载时间数组
 const checkTime = ref<string>('')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.checkStartDate = checkTime.value[0] || ''
   listQuery.value.checkEndDate = checkTime.value[1] || ''
@@ -111,7 +113,12 @@
     listQuery.value.offset = 1
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        checkDate: item.checkDate ? dayjs(item.checkDate).format('YYYY-MM-DD') : '',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
@@ -123,7 +130,7 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -145,12 +152,20 @@
     })
   })
 }
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '取消',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -160,16 +175,12 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
@@ -204,15 +215,39 @@
 const add = () => {
   $router.push('maintenanceCheckList/add')
 }
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (list.value.length > 0) {
+    const params = {
+      approvalStatus: props.status, // 审批状态
+      formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+      applyName: '', // 审批名称
+      applyNo: '', // 审批编号
+      applyType: '9', // 审批类型
+      businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+      checkApplyNo: '', // 检修申请编号
+      checkEndDate: '', // 检修结束时间
+      checkStartDate: '', // 检修开始时间
+      createUser: '', //  创建人
+      overhaulPerson: '', // 检修保养人
+      offset: 1, // 当前页
+      limit: 20, // 一页多少条
+      ids: checkoutList.value,
+    }
+    exportCheckList(params).then((res: any) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备检修保养验收单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -228,20 +263,9 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
+
 // 提交
 const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -260,10 +284,7 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -279,7 +300,8 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
+      $router.push(`maintenanceCheckList/edit/${row.id}/${row.approvalStatusName}/${row.processId}`)
+      // $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -304,9 +326,9 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceCheckListApprovalMenu', newVal)
     fetchData(false)
-  },
-  { immediate: true })
+  })
 
 // 打印列表
 function printList() {
@@ -338,6 +360,17 @@
   cancel: '/device/maintenance/checkList/cancel', // 取消
   delete: '/device/maintenance/checkList/delete', // 删除
 }
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceCheckListApprovalMenu')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceCheckListApprovalMenu')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -377,25 +410,32 @@
       <search-item>
         <el-date-picker
           v-model="checkTime"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="检查日期开始时间"
-          end-placeholder="检查日期结束时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="检修开始日期"
+          end-placeholder="检修结束日期"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 18879cc..e59af7c 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,18 +1,19 @@
+<!-- 设备保养验收单详情 -->
 <script lang="ts" setup name="ListApprovalAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IlistApprovalAddTypes } from '../checkList_interface'
+import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-const loading = ref(false) // 表单加载状态
+
 const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
+const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   add: '新建',
@@ -21,24 +22,28 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-console.log($route.meta.title)
+
+// ------------------------------------------- 路由参数 ----------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else if (pageType.value === 'edit') {
+  //   buttonArray.value = ['提交', '保存']
+  // }
+  // else {
+  //   buttonArray.value = ['提交', '保存']
+  // }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
+  if ($route.params.approvalStatusName) {
+    approvalStatusName.value = $route.params.approvalStatusName as string
+  }
 }
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单-包括表格数据
 const formInline = ref<IlistApprovalAddTypes>({
   acceptanceCheckId: '', // 检修申请id
   applyDesc: '', // 申请说明
@@ -76,52 +81,22 @@
   processResult: '', // 处理结果（设备领用、借用处理结果）
   remark: '', // 备注
   taskId: '', // 任务id（同意、驳回等操作使用）
-  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  checkDate: new Date(), // 检修日期
+  time: '', // 需要传的参数，检修日期
   updateTime: '', // 更新时间
   version: '', // 版本号
 })
-// 审批弹窗信息收集类型
-interface checkIdObjectType {
-  applyName: string
-  applyPersonName: string
-  time: string
-  applyNo: string
-}
+
 // 获取到检修申请列表数据
-const checkIdObject = ref<checkIdObjectType>({
+const checkIdObject = ref({
   applyName: '',
   applyPersonName: '',
-  time: '',
+  checkDate: '',
   applyNo: '',
 })
-// 检修设备列表数据
-const list = ref<object[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  width?: string
-  required: boolean
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
+
+// 设备检修列表
+const columns = ref<IColumnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
@@ -132,6 +107,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: false,
   },
   {
@@ -149,23 +125,19 @@
   },
 ])
 const checkListRef = ref()
-// 检修申请编号按钮
+// 点击选择检修申请编号
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 下拉框列表类型
-interface optionsType {
-  name: string
-  id: string
-  value: string
-}
-// 检修结果下拉框
-const options = ref<optionsType[]>([])
 
+// ------------------------------------------ 字典 --------------------------------------
+// 检修结果下拉框
+const options = ref<dictType[]>([])
 // 获取检修结果
 getDictByCode('maintenanceResults').then((response) => {
   options.value = response.data
 })
+// --------------------------------------------------------------------------------------
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -177,7 +149,7 @@
   applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
   acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检修日期不能为空', trigger: ['blur', 'change'] }],
 })
 
 const onFileChange = (event: any) => {
@@ -203,19 +175,19 @@
 // 获取详情信息
 const getInfo = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
+    // Object.keys(res.data).map((item) => {
+    //   if (typeof (res.data[item]) === 'number') {
+    //     res.data[item] = res.data[item].toString()
+    //   }
+    // })
     checkIdObject.value.applyNo = res.data.checkApplyNo
     checkIdObject.value.applyName = res.data.checkApplyName
     formInline.value = res.data
+    formInline.value.equipmentList = res.data.checkList
+    formInline.value.applyType = '9'
   })
 }
-if (pageType.value !== 'add') {
-  getInfo()
-}
+
 const fileRef = ref() // 文件上传input
 
 // 点击上传文件按钮
@@ -229,8 +201,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -240,18 +212,15 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      close()
     })
+  })
 }
 const approvalDialog = ref()
-// 点击数据后的操作按钮
+// 审批操作-同意-驳回-拒绝-取消
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
     case '同意':
@@ -268,122 +237,122 @@
       break
   }
 }
+// 检查表格第几行信息未完善
+const checkEquipmentList = () => {
+  const index = formInline.value.equipmentList.findIndex((item: any) => !item.overhaulResult || !item.overhaulIdea)
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
 // 保存后的id
 const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
-            formInline.value.fileList = []
-          }
+// 保存
+const save = async (formEl: FormInstance | undefined) => {
+  // 检查表格是否存在增加行信息没有完善的情况
+  const result = checkEquipmentList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
+    return
+  }
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        formInline.value.time = formInline.value.checkDate
+        if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data
             }
           })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateAcceptanceCheckInfo(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          if (approvalStatusName.value === '未通过-驳回') {
+            failUpdateAcceptanceCheckInfo(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else { // 草稿箱和已取消
+            updateAcceptanceCheckInfo(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
         }
       })
     }
+  })
+}
+
+// 点击提交
+const submit = () => {
+  if (addId.value === '') {
+    ElMessage.warning('请先保存')
   }
   else {
-    clickBtn(item)
+    submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
   }
 }
 
-// 标准实验室发生改变row类型
-interface objectReturn {
-  id: string
-  applyName: string
-  applyPersonName: string
-  time: string
-  applyNo: string
-  equipmentId: string
-}
-// 选择完负责人的函数
-const confirmPerson = (object: objectReturn) => {
+// 选择完设备检修列表
+const confirmCheckList = (object: any) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
-
   equipmentApplyInfo({ id: object.id }).then((res) => {
-    res.data.equipmentInfoList.map((item: objectReturn) => {
-      if (item.id) {
-        item.equipmentId = item.id
-      }
-      // 如果选择的没有id则就让装置数组置空
-      else {
-        return formInline.value.equipmentList = []
-      }
-    })
-    formInline.value.equipmentList = res.data.equipmentInfoList
+    if (res.data.equipmentInfoList.length) {
+      formInline.value.equipmentList = res.data.equipmentInfoList.map((item: any) => {
+        return {
+          ...item,
+          equipmentId: item.id,
+        }
+      })
+    }
   })
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add' && approvalStatusName.value !== '草稿箱') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
   }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  // 编辑和详情页面获取详情信息
+  if (pageType.value !== 'add') {
+    getInfo() // 获取详情信息
+    getApprovalRecord(formInline.value.processId) // 获取审批流程
+  }
 })
 </script>
 
@@ -391,8 +360,14 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
+        <!-- <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
           {{ item }}
+        </el-button> -->
+        <el-button v-if="pageType === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -465,10 +440,10 @@
           <el-col :span="6">
             <el-form-item
               label="检修日期:"
-              prop="time"
+              prop="checkDate"
             >
               <el-date-picker
-                v-model="formInline.time"
+                v-model="formInline.checkDate"
                 style="width: 100%;"
                 type="date"
                 :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
@@ -497,7 +472,7 @@
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
               <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '更换附件' : '上传' }}
               </el-button>
             </el-form-item>
           </el-col>
@@ -527,22 +502,22 @@
             >
               <el-option
                 v-for="item in options"
-                :key="item.id"
+                :key="item.value"
                 :label="item.name"
-                :value="item.id"
+                :value="item.value"
               />
             </el-select>
           </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 选择用户列表组件 -->
-    <check-list ref="checkListRef" @add="confirmPerson" />
+    <!-- 选择设备检修列表 -->
+    <check-list ref="checkListRef" @add="confirmCheckList" />
   </app-container>
 </template>
 
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 1d17f4c..5a76153 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,22 +1,18 @@
-<script lang="ts" setup name="approve">
+<!-- 设备保养验收单列表 -->
+<script lang="ts" setup name="MaintenanceCheckList">
 import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
 import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
+    // { name: '同意', type: 'primary' },
+    // { name: '驳回', type: 'primary' },
+    // { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
@@ -47,19 +43,13 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
@@ -69,6 +59,8 @@
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
 const approvalStatusList = dictStore.getApprovalStatus
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -77,20 +69,45 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
-  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+  // sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
-  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
-  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue] || '0'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
@@ -114,7 +131,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
new file mode 100644
index 0000000..15ce154
--- /dev/null
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -0,0 +1,629 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="InterchangeDetail">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import { getDictByCode } from '@/api/system/dict'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  measureContent: '', // 检定项目
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+})// 表单
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: string, callback: Function) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '要求样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 检定方式
+  getDictByCode('measureType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
+}
+getDict()
+
+// 获取检定记录
+const fetchMeasureRecords = (query = null) => {
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
+}
+
+// 获取检定证书
+const fetchCertifications = (query = null) => {
+  if (pageType.value === 'detail') {
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
+  }
+}
+
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 获取详细信息
+const getInfo = () => {
+  getSapmleDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                >
+                  <template v-if="pageType !== 'detail'" #append>
+                    <el-button size="small" @click="customerNoFocus">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="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="校检类别:">
+                <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="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电源电压:" prop="powerVoltage">
+                <el-select
+                  v-model="dataForm.powerVoltage"
+                  :placeholder="pageType === 'detail' ? '' : '请选择电源电压'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of powerVoltageList" :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="measurePeriod">
+                <el-input
+                  v-model="dataForm.measurePeriod"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="检定日期:">
+                <el-date-picker
+                  v-model="dataForm.measureLastTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="有效日期:">
+                <el-date-picker
+                  v-model="dataForm.validDeadline"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.measureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  disabled
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="检定项目:" prop="measureContent">
+                <el-input
+                  v-model="dataForm.measureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index b4a9d9c..f6c0768 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -49,12 +49,12 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
-  { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
+  { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
@@ -62,7 +62,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
@@ -359,7 +359,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.sampleId}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.sampleId}`)
 }
 
 onMounted(async () => {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 1ba8293..2eed09b 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -39,6 +39,7 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -95,8 +96,8 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
-  { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'specialRequire', align: 'center' },
+  { text: '外观', value: 'remark', align: 'center' },
+  { text: '检定要求', value: 'measureContent', align: 'center' },
 ])
 
 // 签章查询数据
@@ -228,6 +229,7 @@
     dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    list.value = []
   }
 }
 
@@ -282,6 +284,14 @@
     })
     return
   }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -427,9 +437,9 @@
           >
             <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"
+                    v-model="dataForm.orderNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index a657382..b3089b4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,6 +27,7 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index d35962f..79a112a 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -159,7 +159,15 @@
         :page-sizes="[5]"
         @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>
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
           确定
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index c087472..3e19b31 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,7 @@
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const isReceived = ref(false) // 样品状态是否已接收
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const ruleFormRef = ref()
@@ -90,6 +91,10 @@
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
+  if ($route.params.status) {
+    isReceived.value = $route.params.status === '2'
+    console.log('样品砖淘', isReceived.value)
+  }
 }
 
 // 获取字典值
@@ -417,7 +422,7 @@
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col><el-col :span="8">
@@ -426,7 +431,7 @@
                     v-model="dataForm.delivererTel"
                     :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -440,7 +445,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -452,7 +457,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -466,7 +471,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -476,14 +481,16 @@
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
-                    style="position: relative;"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  />
-                  <el-button v-if="pageType !== 'detail'" class="selectBtn" size="mini" @click="customerNoFocus">
-                    选择
-                  </el-button>
+                  >
+                    <template v-if="pageType !== 'detail' && !isReceived" #append>
+                      <el-button size="small" @click="customerNoFocus">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -522,7 +529,7 @@
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="证书类别:" prop="certifications">
-                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
                     <el-option
                       v-for="i in certificationsMap"
                       :key="i.value"
@@ -553,7 +560,7 @@
                     type="textarea"
                     autosize
                     :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     :class="{ 'detail-input': pageType === 'detail' }"
                   />
                 </el-form-item>
@@ -566,7 +573,7 @@
                   <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
                   <span v-else-if="pageType === 'detail'">无</span>
                   <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  <el-button v-if="pageType !== 'detail' && !isReceived" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
                     {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
                   </el-button>
                 </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fa8e6b0..d340091 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -260,7 +260,7 @@
   console.log(row)
 
   $router.push({
-    path: `/schedule/order/${pageType}/${row.id}`,
+    path: `/schedule/order/${pageType}/${row.id}/${row.status}`,
     // query: {
     //   statusName: row.statusName,
     // },
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index cbc4a70..0ada9c2 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -97,7 +97,8 @@
   processResult: string // 处理结果（设备领用、借用处理结果）
   remark: string // 备注
   taskId: string // 任务id（同意、驳回等操作使用）
-  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  checkDate: string | Date // 检修时间
+  time: string // 检修日期
   updateTime: string // 更新时间
   version: string // 版本号
 }
@@ -167,3 +168,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 设备检修列表表头类型
+export interface IColumnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index eb2505d..e7f14c6 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -1,4 +1,4 @@
-<!-- 用户列表弹窗 -->
+<!-- 选择设备检修列表 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
@@ -37,6 +37,7 @@
   {
     text: '检修申请编号',
     value: 'applyNo',
+    width: '160',
     align: 'center',
   },
   {
@@ -57,6 +58,7 @@
   {
     text: '检修时间',
     value: 'time',
+    width: '150',
     align: 'center',
   },
   {
@@ -70,9 +72,7 @@
     align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,7 +83,7 @@
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
-  // 获取设备检修列表已完成
+  // 获取设备检修列表
   getEquipmentApplyList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
@@ -97,7 +97,7 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    approvalStatus: '4',
+    approvalStatus: '4', // 已通过
     formId: SCHEDULE.DEVICE_FIX_APPROVAL,
     applyName: '',
     applyNo: '',
@@ -113,8 +113,8 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  // selectTreeRef.value.clearSelected()
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -126,8 +126,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 确认
+const confirm = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
@@ -135,7 +135,7 @@
     reset()
   }
   else {
-    ElMessage.warning('请先选择人员')
+    ElMessage.warning('请选择')
   }
 }
 // 取消
@@ -154,7 +154,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -171,7 +171,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
@@ -181,7 +186,7 @@
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirm">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 20b635c..225f9a7 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,16 +1,21 @@
+<!-- 设备保养验收单列表 -->
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
 import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/measure/plan'
-import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, exportCheckList, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
@@ -28,6 +33,7 @@
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 24
 })
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
@@ -50,15 +56,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
-    width: '160',
+    width: '190',
   },
   {
     text: '验收单名称',
@@ -82,7 +86,7 @@
   },
   {
     text: '检修日期',
-    value: 'createTime',
+    value: 'checkDate',
     align: 'center',
     width: '120',
   },
@@ -94,14 +98,12 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 装载时间数组
 const checkTime = ref<string>('')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.checkStartDate = checkTime.value[0] || ''
   listQuery.value.checkEndDate = checkTime.value[1] || ''
@@ -111,7 +113,12 @@
     listQuery.value.offset = 1
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        checkDate: item.checkDate ? dayjs(item.checkDate).format('YYYY-MM-DD') : '',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
@@ -123,7 +130,7 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -145,12 +152,20 @@
     })
   })
 }
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '取消',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -160,16 +175,12 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
@@ -204,15 +215,39 @@
 const add = () => {
   $router.push('maintenanceCheckList/add')
 }
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (list.value.length > 0) {
+    const params = {
+      approvalStatus: props.status, // 审批状态
+      formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+      applyName: '', // 审批名称
+      applyNo: '', // 审批编号
+      applyType: '9', // 审批类型
+      businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+      checkApplyNo: '', // 检修申请编号
+      checkEndDate: '', // 检修结束时间
+      checkStartDate: '', // 检修开始时间
+      createUser: '', //  创建人
+      overhaulPerson: '', // 检修保养人
+      offset: 1, // 当前页
+      limit: 20, // 一页多少条
+      ids: checkoutList.value,
+    }
+    exportCheckList(params).then((res: any) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备检修保养验收单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -228,20 +263,9 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
+
 // 提交
 const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -260,10 +284,7 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -279,7 +300,8 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
+      $router.push(`maintenanceCheckList/edit/${row.id}/${row.approvalStatusName}/${row.processId}`)
+      // $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -304,9 +326,9 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceCheckListApprovalMenu', newVal)
     fetchData(false)
-  },
-  { immediate: true })
+  })
 
 // 打印列表
 function printList() {
@@ -338,6 +360,17 @@
   cancel: '/device/maintenance/checkList/cancel', // 取消
   delete: '/device/maintenance/checkList/delete', // 删除
 }
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceCheckListApprovalMenu')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceCheckListApprovalMenu')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -377,25 +410,32 @@
       <search-item>
         <el-date-picker
           v-model="checkTime"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="检查日期开始时间"
-          end-placeholder="检查日期结束时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="检修开始日期"
+          end-placeholder="检修结束日期"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 18879cc..e59af7c 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,18 +1,19 @@
+<!-- 设备保养验收单详情 -->
 <script lang="ts" setup name="ListApprovalAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IlistApprovalAddTypes } from '../checkList_interface'
+import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-const loading = ref(false) // 表单加载状态
+
 const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
+const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   add: '新建',
@@ -21,24 +22,28 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-console.log($route.meta.title)
+
+// ------------------------------------------- 路由参数 ----------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else if (pageType.value === 'edit') {
+  //   buttonArray.value = ['提交', '保存']
+  // }
+  // else {
+  //   buttonArray.value = ['提交', '保存']
+  // }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
+  if ($route.params.approvalStatusName) {
+    approvalStatusName.value = $route.params.approvalStatusName as string
+  }
 }
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单-包括表格数据
 const formInline = ref<IlistApprovalAddTypes>({
   acceptanceCheckId: '', // 检修申请id
   applyDesc: '', // 申请说明
@@ -76,52 +81,22 @@
   processResult: '', // 处理结果（设备领用、借用处理结果）
   remark: '', // 备注
   taskId: '', // 任务id（同意、驳回等操作使用）
-  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  checkDate: new Date(), // 检修日期
+  time: '', // 需要传的参数，检修日期
   updateTime: '', // 更新时间
   version: '', // 版本号
 })
-// 审批弹窗信息收集类型
-interface checkIdObjectType {
-  applyName: string
-  applyPersonName: string
-  time: string
-  applyNo: string
-}
+
 // 获取到检修申请列表数据
-const checkIdObject = ref<checkIdObjectType>({
+const checkIdObject = ref({
   applyName: '',
   applyPersonName: '',
-  time: '',
+  checkDate: '',
   applyNo: '',
 })
-// 检修设备列表数据
-const list = ref<object[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  width?: string
-  required: boolean
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
+
+// 设备检修列表
+const columns = ref<IColumnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
@@ -132,6 +107,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: false,
   },
   {
@@ -149,23 +125,19 @@
   },
 ])
 const checkListRef = ref()
-// 检修申请编号按钮
+// 点击选择检修申请编号
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 下拉框列表类型
-interface optionsType {
-  name: string
-  id: string
-  value: string
-}
-// 检修结果下拉框
-const options = ref<optionsType[]>([])
 
+// ------------------------------------------ 字典 --------------------------------------
+// 检修结果下拉框
+const options = ref<dictType[]>([])
 // 获取检修结果
 getDictByCode('maintenanceResults').then((response) => {
   options.value = response.data
 })
+// --------------------------------------------------------------------------------------
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -177,7 +149,7 @@
   applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
   acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检修日期不能为空', trigger: ['blur', 'change'] }],
 })
 
 const onFileChange = (event: any) => {
@@ -203,19 +175,19 @@
 // 获取详情信息
 const getInfo = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
+    // Object.keys(res.data).map((item) => {
+    //   if (typeof (res.data[item]) === 'number') {
+    //     res.data[item] = res.data[item].toString()
+    //   }
+    // })
     checkIdObject.value.applyNo = res.data.checkApplyNo
     checkIdObject.value.applyName = res.data.checkApplyName
     formInline.value = res.data
+    formInline.value.equipmentList = res.data.checkList
+    formInline.value.applyType = '9'
   })
 }
-if (pageType.value !== 'add') {
-  getInfo()
-}
+
 const fileRef = ref() // 文件上传input
 
 // 点击上传文件按钮
@@ -229,8 +201,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -240,18 +212,15 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      close()
     })
+  })
 }
 const approvalDialog = ref()
-// 点击数据后的操作按钮
+// 审批操作-同意-驳回-拒绝-取消
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
     case '同意':
@@ -268,122 +237,122 @@
       break
   }
 }
+// 检查表格第几行信息未完善
+const checkEquipmentList = () => {
+  const index = formInline.value.equipmentList.findIndex((item: any) => !item.overhaulResult || !item.overhaulIdea)
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
 // 保存后的id
 const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
-            formInline.value.fileList = []
-          }
+// 保存
+const save = async (formEl: FormInstance | undefined) => {
+  // 检查表格是否存在增加行信息没有完善的情况
+  const result = checkEquipmentList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
+    return
+  }
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        formInline.value.time = formInline.value.checkDate
+        if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data
             }
           })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateAcceptanceCheckInfo(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          if (approvalStatusName.value === '未通过-驳回') {
+            failUpdateAcceptanceCheckInfo(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else { // 草稿箱和已取消
+            updateAcceptanceCheckInfo(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
         }
       })
     }
+  })
+}
+
+// 点击提交
+const submit = () => {
+  if (addId.value === '') {
+    ElMessage.warning('请先保存')
   }
   else {
-    clickBtn(item)
+    submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
   }
 }
 
-// 标准实验室发生改变row类型
-interface objectReturn {
-  id: string
-  applyName: string
-  applyPersonName: string
-  time: string
-  applyNo: string
-  equipmentId: string
-}
-// 选择完负责人的函数
-const confirmPerson = (object: objectReturn) => {
+// 选择完设备检修列表
+const confirmCheckList = (object: any) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
-
   equipmentApplyInfo({ id: object.id }).then((res) => {
-    res.data.equipmentInfoList.map((item: objectReturn) => {
-      if (item.id) {
-        item.equipmentId = item.id
-      }
-      // 如果选择的没有id则就让装置数组置空
-      else {
-        return formInline.value.equipmentList = []
-      }
-    })
-    formInline.value.equipmentList = res.data.equipmentInfoList
+    if (res.data.equipmentInfoList.length) {
+      formInline.value.equipmentList = res.data.equipmentInfoList.map((item: any) => {
+        return {
+          ...item,
+          equipmentId: item.id,
+        }
+      })
+    }
   })
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add' && approvalStatusName.value !== '草稿箱') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
   }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  // 编辑和详情页面获取详情信息
+  if (pageType.value !== 'add') {
+    getInfo() // 获取详情信息
+    getApprovalRecord(formInline.value.processId) // 获取审批流程
+  }
 })
 </script>
 
@@ -391,8 +360,14 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
+        <!-- <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
           {{ item }}
+        </el-button> -->
+        <el-button v-if="pageType === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -465,10 +440,10 @@
           <el-col :span="6">
             <el-form-item
               label="检修日期:"
-              prop="time"
+              prop="checkDate"
             >
               <el-date-picker
-                v-model="formInline.time"
+                v-model="formInline.checkDate"
                 style="width: 100%;"
                 type="date"
                 :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
@@ -497,7 +472,7 @@
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
               <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '更换附件' : '上传' }}
               </el-button>
             </el-form-item>
           </el-col>
@@ -527,22 +502,22 @@
             >
               <el-option
                 v-for="item in options"
-                :key="item.id"
+                :key="item.value"
                 :label="item.name"
-                :value="item.id"
+                :value="item.value"
               />
             </el-select>
           </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 选择用户列表组件 -->
-    <check-list ref="checkListRef" @add="confirmPerson" />
+    <!-- 选择设备检修列表 -->
+    <check-list ref="checkListRef" @add="confirmCheckList" />
   </app-container>
 </template>
 
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 1d17f4c..5a76153 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,22 +1,18 @@
-<script lang="ts" setup name="approve">
+<!-- 设备保养验收单列表 -->
+<script lang="ts" setup name="MaintenanceCheckList">
 import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
 import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
+    // { name: '同意', type: 'primary' },
+    // { name: '驳回', type: 'primary' },
+    // { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
@@ -47,19 +43,13 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
@@ -69,6 +59,8 @@
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
 const approvalStatusList = dictStore.getApprovalStatus
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -77,20 +69,45 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
-  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+  // sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
-  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
-  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue] || '0'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
@@ -114,7 +131,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 98b01f2..daca294 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -240,8 +240,15 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="140">
+          <el-table-column label="操作" align="center" width="110">
             <template #default="{ row }">
               <el-button
                 size="small"

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
new file mode 100644
index 0000000..15ce154
--- /dev/null
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -0,0 +1,629 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="InterchangeDetail">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import { getDictByCode } from '@/api/system/dict'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  measureContent: '', // 检定项目
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+})// 表单
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: string, callback: Function) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '要求样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 检定方式
+  getDictByCode('measureType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
+}
+getDict()
+
+// 获取检定记录
+const fetchMeasureRecords = (query = null) => {
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
+}
+
+// 获取检定证书
+const fetchCertifications = (query = null) => {
+  if (pageType.value === 'detail') {
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
+  }
+}
+
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 获取详细信息
+const getInfo = () => {
+  getSapmleDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                >
+                  <template v-if="pageType !== 'detail'" #append>
+                    <el-button size="small" @click="customerNoFocus">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="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="校检类别:">
+                <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="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电源电压:" prop="powerVoltage">
+                <el-select
+                  v-model="dataForm.powerVoltage"
+                  :placeholder="pageType === 'detail' ? '' : '请选择电源电压'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of powerVoltageList" :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="measurePeriod">
+                <el-input
+                  v-model="dataForm.measurePeriod"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="检定日期:">
+                <el-date-picker
+                  v-model="dataForm.measureLastTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="有效日期:">
+                <el-date-picker
+                  v-model="dataForm.validDeadline"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.measureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  disabled
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="检定项目:" prop="measureContent">
+                <el-input
+                  v-model="dataForm.measureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index b4a9d9c..f6c0768 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -49,12 +49,12 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
-  { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
+  { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
@@ -62,7 +62,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
@@ -359,7 +359,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.sampleId}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.sampleId}`)
 }
 
 onMounted(async () => {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 1ba8293..2eed09b 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -39,6 +39,7 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -95,8 +96,8 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
-  { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'specialRequire', align: 'center' },
+  { text: '外观', value: 'remark', align: 'center' },
+  { text: '检定要求', value: 'measureContent', align: 'center' },
 ])
 
 // 签章查询数据
@@ -228,6 +229,7 @@
     dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    list.value = []
   }
 }
 
@@ -282,6 +284,14 @@
     })
     return
   }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -427,9 +437,9 @@
           >
             <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"
+                    v-model="dataForm.orderNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index a657382..b3089b4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,6 +27,7 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index d35962f..79a112a 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -159,7 +159,15 @@
         :page-sizes="[5]"
         @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>
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
           确定
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index c087472..3e19b31 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,7 @@
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const isReceived = ref(false) // 样品状态是否已接收
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const ruleFormRef = ref()
@@ -90,6 +91,10 @@
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
+  if ($route.params.status) {
+    isReceived.value = $route.params.status === '2'
+    console.log('样品砖淘', isReceived.value)
+  }
 }
 
 // 获取字典值
@@ -417,7 +422,7 @@
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col><el-col :span="8">
@@ -426,7 +431,7 @@
                     v-model="dataForm.delivererTel"
                     :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -440,7 +445,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -452,7 +457,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -466,7 +471,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -476,14 +481,16 @@
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
-                    style="position: relative;"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  />
-                  <el-button v-if="pageType !== 'detail'" class="selectBtn" size="mini" @click="customerNoFocus">
-                    选择
-                  </el-button>
+                  >
+                    <template v-if="pageType !== 'detail' && !isReceived" #append>
+                      <el-button size="small" @click="customerNoFocus">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -522,7 +529,7 @@
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="证书类别:" prop="certifications">
-                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
                     <el-option
                       v-for="i in certificationsMap"
                       :key="i.value"
@@ -553,7 +560,7 @@
                     type="textarea"
                     autosize
                     :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     :class="{ 'detail-input': pageType === 'detail' }"
                   />
                 </el-form-item>
@@ -566,7 +573,7 @@
                   <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
                   <span v-else-if="pageType === 'detail'">无</span>
                   <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  <el-button v-if="pageType !== 'detail' && !isReceived" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
                     {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
                   </el-button>
                 </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fa8e6b0..d340091 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -260,7 +260,7 @@
   console.log(row)
 
   $router.push({
-    path: `/schedule/order/${pageType}/${row.id}`,
+    path: `/schedule/order/${pageType}/${row.id}/${row.status}`,
     // query: {
     //   statusName: row.statusName,
     // },
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index cbc4a70..0ada9c2 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -97,7 +97,8 @@
   processResult: string // 处理结果（设备领用、借用处理结果）
   remark: string // 备注
   taskId: string // 任务id（同意、驳回等操作使用）
-  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  checkDate: string | Date // 检修时间
+  time: string // 检修日期
   updateTime: string // 更新时间
   version: string // 版本号
 }
@@ -167,3 +168,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 设备检修列表表头类型
+export interface IColumnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index eb2505d..e7f14c6 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -1,4 +1,4 @@
-<!-- 用户列表弹窗 -->
+<!-- 选择设备检修列表 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
@@ -37,6 +37,7 @@
   {
     text: '检修申请编号',
     value: 'applyNo',
+    width: '160',
     align: 'center',
   },
   {
@@ -57,6 +58,7 @@
   {
     text: '检修时间',
     value: 'time',
+    width: '150',
     align: 'center',
   },
   {
@@ -70,9 +72,7 @@
     align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,7 +83,7 @@
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
-  // 获取设备检修列表已完成
+  // 获取设备检修列表
   getEquipmentApplyList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
@@ -97,7 +97,7 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    approvalStatus: '4',
+    approvalStatus: '4', // 已通过
     formId: SCHEDULE.DEVICE_FIX_APPROVAL,
     applyName: '',
     applyNo: '',
@@ -113,8 +113,8 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  // selectTreeRef.value.clearSelected()
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -126,8 +126,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 确认
+const confirm = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
@@ -135,7 +135,7 @@
     reset()
   }
   else {
-    ElMessage.warning('请先选择人员')
+    ElMessage.warning('请选择')
   }
 }
 // 取消
@@ -154,7 +154,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -171,7 +171,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
@@ -181,7 +186,7 @@
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirm">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 20b635c..225f9a7 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,16 +1,21 @@
+<!-- 设备保养验收单列表 -->
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
 import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/measure/plan'
-import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, exportCheckList, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
@@ -28,6 +33,7 @@
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 24
 })
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
@@ -50,15 +56,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
-    width: '160',
+    width: '190',
   },
   {
     text: '验收单名称',
@@ -82,7 +86,7 @@
   },
   {
     text: '检修日期',
-    value: 'createTime',
+    value: 'checkDate',
     align: 'center',
     width: '120',
   },
@@ -94,14 +98,12 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 装载时间数组
 const checkTime = ref<string>('')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.checkStartDate = checkTime.value[0] || ''
   listQuery.value.checkEndDate = checkTime.value[1] || ''
@@ -111,7 +113,12 @@
     listQuery.value.offset = 1
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        checkDate: item.checkDate ? dayjs(item.checkDate).format('YYYY-MM-DD') : '',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
@@ -123,7 +130,7 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -145,12 +152,20 @@
     })
   })
 }
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '取消',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -160,16 +175,12 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
@@ -204,15 +215,39 @@
 const add = () => {
   $router.push('maintenanceCheckList/add')
 }
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (list.value.length > 0) {
+    const params = {
+      approvalStatus: props.status, // 审批状态
+      formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+      applyName: '', // 审批名称
+      applyNo: '', // 审批编号
+      applyType: '9', // 审批类型
+      businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+      checkApplyNo: '', // 检修申请编号
+      checkEndDate: '', // 检修结束时间
+      checkStartDate: '', // 检修开始时间
+      createUser: '', //  创建人
+      overhaulPerson: '', // 检修保养人
+      offset: 1, // 当前页
+      limit: 20, // 一页多少条
+      ids: checkoutList.value,
+    }
+    exportCheckList(params).then((res: any) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备检修保养验收单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -228,20 +263,9 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
+
 // 提交
 const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -260,10 +284,7 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -279,7 +300,8 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
+      $router.push(`maintenanceCheckList/edit/${row.id}/${row.approvalStatusName}/${row.processId}`)
+      // $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -304,9 +326,9 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceCheckListApprovalMenu', newVal)
     fetchData(false)
-  },
-  { immediate: true })
+  })
 
 // 打印列表
 function printList() {
@@ -338,6 +360,17 @@
   cancel: '/device/maintenance/checkList/cancel', // 取消
   delete: '/device/maintenance/checkList/delete', // 删除
 }
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceCheckListApprovalMenu')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceCheckListApprovalMenu')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -377,25 +410,32 @@
       <search-item>
         <el-date-picker
           v-model="checkTime"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="检查日期开始时间"
-          end-placeholder="检查日期结束时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="检修开始日期"
+          end-placeholder="检修结束日期"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 18879cc..e59af7c 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,18 +1,19 @@
+<!-- 设备保养验收单详情 -->
 <script lang="ts" setup name="ListApprovalAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IlistApprovalAddTypes } from '../checkList_interface'
+import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-const loading = ref(false) // 表单加载状态
+
 const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
+const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   add: '新建',
@@ -21,24 +22,28 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-console.log($route.meta.title)
+
+// ------------------------------------------- 路由参数 ----------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else if (pageType.value === 'edit') {
+  //   buttonArray.value = ['提交', '保存']
+  // }
+  // else {
+  //   buttonArray.value = ['提交', '保存']
+  // }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
+  if ($route.params.approvalStatusName) {
+    approvalStatusName.value = $route.params.approvalStatusName as string
+  }
 }
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单-包括表格数据
 const formInline = ref<IlistApprovalAddTypes>({
   acceptanceCheckId: '', // 检修申请id
   applyDesc: '', // 申请说明
@@ -76,52 +81,22 @@
   processResult: '', // 处理结果（设备领用、借用处理结果）
   remark: '', // 备注
   taskId: '', // 任务id（同意、驳回等操作使用）
-  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  checkDate: new Date(), // 检修日期
+  time: '', // 需要传的参数，检修日期
   updateTime: '', // 更新时间
   version: '', // 版本号
 })
-// 审批弹窗信息收集类型
-interface checkIdObjectType {
-  applyName: string
-  applyPersonName: string
-  time: string
-  applyNo: string
-}
+
 // 获取到检修申请列表数据
-const checkIdObject = ref<checkIdObjectType>({
+const checkIdObject = ref({
   applyName: '',
   applyPersonName: '',
-  time: '',
+  checkDate: '',
   applyNo: '',
 })
-// 检修设备列表数据
-const list = ref<object[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  width?: string
-  required: boolean
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
+
+// 设备检修列表
+const columns = ref<IColumnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
@@ -132,6 +107,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: false,
   },
   {
@@ -149,23 +125,19 @@
   },
 ])
 const checkListRef = ref()
-// 检修申请编号按钮
+// 点击选择检修申请编号
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 下拉框列表类型
-interface optionsType {
-  name: string
-  id: string
-  value: string
-}
-// 检修结果下拉框
-const options = ref<optionsType[]>([])
 
+// ------------------------------------------ 字典 --------------------------------------
+// 检修结果下拉框
+const options = ref<dictType[]>([])
 // 获取检修结果
 getDictByCode('maintenanceResults').then((response) => {
   options.value = response.data
 })
+// --------------------------------------------------------------------------------------
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -177,7 +149,7 @@
   applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
   acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检修日期不能为空', trigger: ['blur', 'change'] }],
 })
 
 const onFileChange = (event: any) => {
@@ -203,19 +175,19 @@
 // 获取详情信息
 const getInfo = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
+    // Object.keys(res.data).map((item) => {
+    //   if (typeof (res.data[item]) === 'number') {
+    //     res.data[item] = res.data[item].toString()
+    //   }
+    // })
     checkIdObject.value.applyNo = res.data.checkApplyNo
     checkIdObject.value.applyName = res.data.checkApplyName
     formInline.value = res.data
+    formInline.value.equipmentList = res.data.checkList
+    formInline.value.applyType = '9'
   })
 }
-if (pageType.value !== 'add') {
-  getInfo()
-}
+
 const fileRef = ref() // 文件上传input
 
 // 点击上传文件按钮
@@ -229,8 +201,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -240,18 +212,15 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      close()
     })
+  })
 }
 const approvalDialog = ref()
-// 点击数据后的操作按钮
+// 审批操作-同意-驳回-拒绝-取消
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
     case '同意':
@@ -268,122 +237,122 @@
       break
   }
 }
+// 检查表格第几行信息未完善
+const checkEquipmentList = () => {
+  const index = formInline.value.equipmentList.findIndex((item: any) => !item.overhaulResult || !item.overhaulIdea)
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
 // 保存后的id
 const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
-            formInline.value.fileList = []
-          }
+// 保存
+const save = async (formEl: FormInstance | undefined) => {
+  // 检查表格是否存在增加行信息没有完善的情况
+  const result = checkEquipmentList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
+    return
+  }
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        formInline.value.time = formInline.value.checkDate
+        if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data
             }
           })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateAcceptanceCheckInfo(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          if (approvalStatusName.value === '未通过-驳回') {
+            failUpdateAcceptanceCheckInfo(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else { // 草稿箱和已取消
+            updateAcceptanceCheckInfo(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
         }
       })
     }
+  })
+}
+
+// 点击提交
+const submit = () => {
+  if (addId.value === '') {
+    ElMessage.warning('请先保存')
   }
   else {
-    clickBtn(item)
+    submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
   }
 }
 
-// 标准实验室发生改变row类型
-interface objectReturn {
-  id: string
-  applyName: string
-  applyPersonName: string
-  time: string
-  applyNo: string
-  equipmentId: string
-}
-// 选择完负责人的函数
-const confirmPerson = (object: objectReturn) => {
+// 选择完设备检修列表
+const confirmCheckList = (object: any) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
-
   equipmentApplyInfo({ id: object.id }).then((res) => {
-    res.data.equipmentInfoList.map((item: objectReturn) => {
-      if (item.id) {
-        item.equipmentId = item.id
-      }
-      // 如果选择的没有id则就让装置数组置空
-      else {
-        return formInline.value.equipmentList = []
-      }
-    })
-    formInline.value.equipmentList = res.data.equipmentInfoList
+    if (res.data.equipmentInfoList.length) {
+      formInline.value.equipmentList = res.data.equipmentInfoList.map((item: any) => {
+        return {
+          ...item,
+          equipmentId: item.id,
+        }
+      })
+    }
   })
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add' && approvalStatusName.value !== '草稿箱') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
   }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  // 编辑和详情页面获取详情信息
+  if (pageType.value !== 'add') {
+    getInfo() // 获取详情信息
+    getApprovalRecord(formInline.value.processId) // 获取审批流程
+  }
 })
 </script>
 
@@ -391,8 +360,14 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
+        <!-- <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
           {{ item }}
+        </el-button> -->
+        <el-button v-if="pageType === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -465,10 +440,10 @@
           <el-col :span="6">
             <el-form-item
               label="检修日期:"
-              prop="time"
+              prop="checkDate"
             >
               <el-date-picker
-                v-model="formInline.time"
+                v-model="formInline.checkDate"
                 style="width: 100%;"
                 type="date"
                 :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
@@ -497,7 +472,7 @@
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
               <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '更换附件' : '上传' }}
               </el-button>
             </el-form-item>
           </el-col>
@@ -527,22 +502,22 @@
             >
               <el-option
                 v-for="item in options"
-                :key="item.id"
+                :key="item.value"
                 :label="item.name"
-                :value="item.id"
+                :value="item.value"
               />
             </el-select>
           </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 选择用户列表组件 -->
-    <check-list ref="checkListRef" @add="confirmPerson" />
+    <!-- 选择设备检修列表 -->
+    <check-list ref="checkListRef" @add="confirmCheckList" />
   </app-container>
 </template>
 
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 1d17f4c..5a76153 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,22 +1,18 @@
-<script lang="ts" setup name="approve">
+<!-- 设备保养验收单列表 -->
+<script lang="ts" setup name="MaintenanceCheckList">
 import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
 import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
+    // { name: '同意', type: 'primary' },
+    // { name: '驳回', type: 'primary' },
+    // { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
@@ -47,19 +43,13 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
@@ -69,6 +59,8 @@
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
 const approvalStatusList = dictStore.getApprovalStatus
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -77,20 +69,45 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
-  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+  // sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
-  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
-  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue] || '0'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
@@ -114,7 +131,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 98b01f2..daca294 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -240,8 +240,15 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="140">
+          <el-table-column label="操作" align="center" width="110">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git "a/\350\256\241\351\207\217 \0502\051.zip" "b/\350\256\241\351\207\217 \0502\051.zip"
deleted file mode 100644
index dfca0ba..0000000
--- "a/\350\256\241\351\207\217 \0502\051.zip"
+++ /dev/null
Binary files differ

diff --git a/.env.production b/.env.production
index 2b78f8d..06442a5 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@
 # 页面标题
 VITE_APP_TITLE = 计量业务系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.83.213:8085
-VITE_APP_API_BASEURL = http://192.168.2.6:8085
+# VITE_APP_API_BASEURL = http://192.168.2.6:8085
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 
diff --git a/jl.zip b/jl.zip
deleted file mode 100644
index 40d750d..0000000
--- a/jl.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts
index f12a3bd..fcae32e 100644
--- a/src/api/device/checkList.ts
+++ b/src/api/device/checkList.ts
@@ -28,6 +28,16 @@
   })
 }
 
+// 保养验收单导出
+export function exportCheckList(data: object) {
+  return request({
+    url: '/acceptanceCheck/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 // 获取详情数据
 export function getselectCheckInfo(data: object) {
   return request({
@@ -134,7 +144,7 @@
   })
 }
 
-// 设备检修保养验收单编辑
+// 设备检修保养验收单编辑--草稿箱、已取消
 export function updateAcceptanceCheckInfo(data: object) {
   return request({
     url: '/acceptanceCheck/updateAcceptanceCheckInfo',
@@ -142,6 +152,14 @@
     data,
   })
 }
+// 设备检修保养验收单编辑--未通过-驳回
+export function failUpdateAcceptanceCheckInfo(data: object) {
+  return request({
+    url: '/acceptanceCheck/failUpdate',
+    method: 'post',
+    data,
+  })
+}
 
 // 设备检修保养验收单详情信息
 export function acceptanceCheckInfo(data: object) {
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
index fbf0b2f..047d441 100644
--- a/src/assets/styles/globals.scss
+++ b/src/assets/styles/globals.scss
@@ -109,6 +109,10 @@
   }
 }
 
+.el-input-group__append {
+  color: #3d7eff;
+}
+
 .el-button.is-link {
   .el-button__text--expand {
     letter-spacing: 0.1em;
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 985d230..81b49b4 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -196,7 +196,7 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" />
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
       <slot name="preColumns" />
       <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
         <template #default="scope">
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 214d0bd..07121f2 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -50,7 +50,7 @@
         },
       },
       {
-        path: 'order/:type/:id?',
+        path: 'order/:type/:id?/:status?',
         name: 'OrderDetail',
         component: () => import('@/views/business/schedule/order/orderEdit.vue'),
         meta: {
@@ -72,6 +72,18 @@
         },
       },
       {
+        path: 'interchange/:type/:id?',
+        name: 'InterchangeDetail',
+        component: () => import('@/views/business/schedule/interchange/interchangeDetail.vue'),
+        meta: {
+          title: '设备收发详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/interchangeList',
+        },
+      },
+      {
         path: 'receiptList',
         name: 'InterchangeReceiptList',
         component: () => import('@/views/business/schedule/interchangeReceipt/receiptList.vue'),
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 77e2576..a8a16fd 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -432,7 +432,7 @@
         },
       },
       {
-        path: 'maintenanceCheckList/:type/:id?/:processId?',
+        path: 'maintenanceCheckList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 51b9cba..8083780 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -59,7 +59,7 @@
   delete: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'
+      return hasPermission(permPath) && row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'
     },
     disabled: (row: any) => {
       return row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 79bb1a7..807ea30 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -15,7 +15,7 @@
 const listQuery = ref<IListQuery>({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
-  beginTime: '', // 记录开始时间
+  startTime: '', // 记录开始时间
   endTime: '', // 记录结束时间
   offset: 1, // 当前页
   limit: 20, // 多少条
@@ -40,7 +40,7 @@
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.beginTime = trainTime.value[0] || ''
+  listQuery.value.startTime = trainTime.value[0] || ''
   listQuery.value.endTime = trainTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
@@ -65,7 +65,7 @@
   listQuery.value = {
     environmentCode: '', // 记录单编号
     roomNumber: '', // 房间号
-    beginTime: '', // 记录开始时间
+    startTime: '', // 记录开始时间
     endTime: '', // 记录结束时间
     offset: 1, // 当前页
     limit: 20, // 多少条
@@ -85,7 +85,7 @@
     const params = {
       environmentCode: '', // 记录单编号
       roomNumber: '', // 房间号
-      beginTime: '', // 记录开始时间
+      startTime: '', // 记录开始时间
       endTime: '', // 记录结束时间
       offset: 1, // 当前页
       limit: 20, // 多少条
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index e1dc2a2..86a838d 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -2,7 +2,7 @@
 export interface IListQuery {
   environmentCode: string // 记录单编号
   roomNumber: string // 房间号
-  beginTime: string // 记录开始时间
+  startTime: string // 记录开始时间
   endTime: string // 记录结束时间
   offset: number // 当前页
   limit: number // 多少条
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index bbbb958..d1c9f50 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -39,7 +39,7 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '检校类别', value: 'measureCategory', align: 'center' },
-  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建人', value: 'createUserName', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index b0b0037..c9b7843 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -192,7 +192,7 @@
   'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
-  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  // 'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
   'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -232,8 +232,43 @@
   fileRef.value.click()
 }
 
+// 检查表格第几行信息未完善
+const checkList = (list: any, no: string, name: string) => {
+  const index = list.findIndex((item: any) => !item[no] && !item[name])
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
+
 // 点击保存
 const save = async (formEl: FormInstance | undefined) => {
+  if (!formInline.value.equipmentInfoList.length) {
+    ElMessage.warning('所用设备不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.equipmentInfoList, 'equipmentNo', 'equipmentName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所用设备表格第${result}行信息未完善`)
+      return
+    }
+  }
+  if (!formInline.value.fileList.length) {
+    ElMessage.warning('所依据的技术文件不能为空')
+    return
+  }
+  else {
+    // 检查表格是否存在增加行信息没有完善的情况
+    const result = checkList(formInline.value.fileList, 'fileNo', 'fileName')
+    if (result !== 'pass') {
+      ElMessage.warning(`所依据的技术文件表格第${result}行信息未完善`)
+      return
+    }
+  }
   if (!formEl) { return }
   await formEl.validate((valid) => {
     if (valid) {
@@ -751,7 +786,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index c47d53e..9805617 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -61,13 +61,12 @@
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
   { text: '检校类别', value: 'measureCategoryName', align: 'center' },
-  { text: '检定人员', value: 'measurePersonId', align: 'center' },
+  { text: '检定人员', value: 'measurePersonName', align: 'center' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 表格loadingTable
@@ -168,7 +167,7 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status, // 审批状态
+    approvalStatus: props.status! || '0', // 审批状态
     certificateReportCode: '', // 证书号
     customerName: '', // 委托方名称
     measureCategory: '', // 检校类别
@@ -182,38 +181,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: '下载中请稍后',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (list.value.length > 0) {
-    const params = {
-      approvalStatus: listQuery.value.approvalStatus, // 审批状态
-      certificateReportCode: listQuery.value.certificateReportCode, // 证书号
-      customerName: listQuery.value.customerName, // 委托方名称
-      measureCategory: listQuery.value.measureCategory, // 检校类别
-      orderCode: listQuery.value.orderCode, // 委托书编号
-      sampleName: listQuery.value.sampleName, // 样品名称
-      sampleNo: listQuery.value.sampleNo, // 样品编号
-      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
-      offset: 1,
-      limit: 20,
-      ids: checkoutList.value,
-    }
-    exportReportList(params).then((res) => {
-      const blob = new Blob([res.data])
-      exportFile(blob, '证书报告列表.xlsx')
-    })
-  }
-  else {
-    ElMessage.warning('无数据可导出数据')
-  }
-  loading.close()
-}
-
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -246,10 +213,7 @@
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
new file mode 100644
index 0000000..15ce154
--- /dev/null
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -0,0 +1,629 @@
+<!-- 新建、编辑、详情 -->
+<script lang="ts" setup name="InterchangeDetail">
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+import { ref } from 'vue'
+import type { ISampleEdit, Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
+import selectCustomer from '@/views/customer/sample/list/selectCustomer.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
+import { addSample, getCertification, getMesureRecords, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import countries from '@/components/AddressSelect/country-code.json'
+import { UploadFile } from '@/api/measure/file'
+import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
+import { getDictByCode } from '@/api/system/dict'
+
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+const pageType = ref('add') // 页面类型: add, edit, detail
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const visible = ref(false) // 控制对话框显隐
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const measureTypeList = ref<dictType[]>([]) // 检定方式
+const powerVoltageList = ref<dictType[]>([]) // 电源电压
+const dataForm: Ref<ISampleEdit> = ref({
+  id: '',
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  ABC: '', // ABC
+  // deliverer: '', // 送检人
+  // delivererTel: '', // 送检人联系方式
+  measureContent: '', // 检定项目
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+})// 表单
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: string, callback: Function) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  sampleName: [{ required: true, message: '要求样品名称不能为空', trigger: 'blur' }],
+  sampleModel: [{ required: true, message: '要求样品型号不能为空', trigger: 'blur' }],
+  manufacturingNo: [{ required: true, message: '要求出厂编号不能为空', trigger: 'blur' }],
+  customerNo: [{ required: true, message: '要求委托方代码不能为空', trigger: 'change' }],
+  customerName: [{ required: true, message: '要求委托方名称不能为空', trigger: 'change' }],
+  phone: [{ required: true, message: '要求委托方电话不能为空', trigger: 'change' }],
+  postalCode: [{ required: true, message: '要求委托方邮编不能为空', trigger: 'change' }],
+  customerAddress: [{ required: true, message: '要求委托方地址不能为空', trigger: 'change' }],
+  measureContent: [{ required: true, message: '要求检定项目不能为空', trigger: 'blur' }],
+  measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+  powerVoltage: [{ required: true, message: '要求电源电压不能为空', trigger: 'change' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取字典值
+function getDict() {
+  // 校检类别
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 检定方式
+  getDictByCode('measureType').then((response) => {
+    measureTypeList.value = response.data
+  })
+  // 电源电压
+  getDictByCode('powerVoltage').then((response) => {
+    powerVoltageList.value = response.data
+  })
+}
+getDict()
+
+// 获取检定记录
+const fetchMeasureRecords = (query = null) => {
+  if (pageType.value === 'detail') {
+    getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.measureRecords = res.data.rows
+    })
+  }
+}
+
+// 获取检定证书
+const fetchCertifications = (query = null) => {
+  if (pageType.value === 'detail') {
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
+  }
+}
+
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode', align: 'center' },
+      { text: '委托单日期', value: 'orderTime', align: 'center' },
+      { text: '委托方代码', value: 'customerCode', align: 'center' },
+      { text: '委托方名称', value: 'customerName', align: 'center' },
+      { text: '送检人', value: 'deliverer', align: 'center' },
+      { text: '送检日期', value: 'deliverTime', align: 'center' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode', align: 'center' },
+      { text: '证书名称', value: 'certificationName', align: 'center' },
+      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
+      { text: '证书有效期', value: 'expirationDate', align: 'center' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('检定记录')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 委托方代码获取焦点
+const customerNoFocus = () => {
+  visible.value = true
+}
+
+// 选好委托方
+const confirmCheckout = (val: Array<ICustomer>) => {
+  if (val && val.length) {
+    const getValue = val[0]
+    dataForm.value.customerNo = getValue.customerNo // 委托方代码
+    dataForm.value.customerId = getValue.id // 委托方id
+    dataForm.value.customerName = getValue.customerName // 委托方名称
+    dataForm.value.phone = getValue.phone // 电话
+    dataForm.value.postalCode = getValue.postalCode // 邮编
+    dataForm.value.customerAddress = getValue.fullAddress // 委托方地址
+  }
+}
+
+// 控制选择委托方对话框显隐
+const changeVisible = (val: boolean) => {
+  visible.value = val
+}
+
+// 保存
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+
+// 获取详细信息
+const getInfo = () => {
+  getSapmleDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    dataForm.value.ABC = res.data.abc
+    for (const item of menu) {
+      item.searchFunc()
+    }
+  })
+}
+
+// 非添加页面获取详情
+if (pageType.value !== 'add') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`样品-${textMap[pageType]}`">
+      <template #btns>
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="dataForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="dataForm.sampleNo"
+                  :placeholder="pageType === 'detail' ? '' : '系统自动生成'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="dataForm.sampleName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col><el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="dataForm.sampleModel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入样品型号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="dataForm.manufacturingNo"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="dataForm.customerNo"
+                  :placeholder="pageType === 'detail' ? '' : '请选择委托方代码'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                >
+                  <template v-if="pageType !== 'detail'" #append>
+                    <el-button size="small" @click="customerNoFocus">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="dataForm.customerName"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="dataForm.phone"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="dataForm.postalCode"
+                  :placeholder="pageType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="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="校检类别:">
+                <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="生产厂家:">
+                <el-input
+                  v-model="dataForm.manufacturer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="dataForm.manufacturerCountry"
+                  :placeholder="pageType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="dataForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="dataForm.ABC"
+                  :placeholder="pageType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="电源电压:" prop="powerVoltage">
+                <el-select
+                  v-model="dataForm.powerVoltage"
+                  :placeholder="pageType === 'detail' ? '' : '请选择电源电压'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of powerVoltageList" :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="measurePeriod">
+                <el-input
+                  v-model="dataForm.measurePeriod"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="检定日期:">
+                <el-date-picker
+                  v-model="dataForm.measureLastTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="有效日期:">
+                <el-date-picker
+                  v-model="dataForm.validDeadline"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入有效日期'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="dataForm.deliverer"
+                  :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType === 'detail'" :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="dataForm.delivererTel"
+                  :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="dataForm.measureType"
+                  :placeholder="pageType === 'detail' ? '' : '请选择检定方式'"
+                  disabled
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of measureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="dataForm.labelBind"
+                  :placeholder="pageType === 'detail' ? '' : '标签绑定'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="检定项目:" prop="measureContent">
+                <el-input
+                  v-model="dataForm.measureContent"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="dataForm.remark"
+                  type="textarea"
+                  autosize
+                  :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                  :disabled="pageType === 'detail'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24" class="marg">
+            <el-col :span="12">
+              <el-form-item label="说明书:">
+                <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+                <span v-else-if="pageType === 'detail'">无</span>
+                <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+            {{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
+    </detail-block-switch>
+
+    <!-- 选择委托方组件 -->
+    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index b4a9d9c..f6c0768 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -49,12 +49,12 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
   { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
-  { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
+  { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
@@ -62,7 +62,7 @@
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
@@ -359,7 +359,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/sample/${pageType}/${row.sampleId}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.sampleId}`)
 }
 
 onMounted(async () => {
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 1ba8293..2eed09b 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -39,6 +39,7 @@
 const dataForm: Ref<IReceiptDetail> = ref({
   interchangeCode: '', // 交接单编号
   orderCode: '', // 委托书编号
+  orderNo: '', // 委托书编号
   orderId: '', // 委托书id
   certificationCompany: '', // 证书单位名称
   certificationCompanyFex: '', // 传真
@@ -95,8 +96,8 @@
   { text: '型号', value: 'sampleModel', align: 'center', required: true },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center', required: true },
   { text: '附件说明', value: 'appendixDescn', align: 'center' },
-  { text: '外观', value: 'appearance', align: 'center' },
-  { text: '检定要求', value: 'specialRequire', align: 'center' },
+  { text: '外观', value: 'remark', align: 'center' },
+  { text: '检定要求', value: 'measureContent', align: 'center' },
 ])
 
 // 签章查询数据
@@ -228,6 +229,7 @@
     dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
+    list.value = []
   }
 }
 
@@ -282,6 +284,14 @@
     })
     return
   }
+  if (!list.value.length) {
+    ElMessage({
+      message: '被测样品列表不能为空',
+      type: 'warning',
+      duration: 2000,
+    })
+    return
+  }
   if (!formEl) { return }
   formEl.validate((valid) => {
     if (valid) {
@@ -427,9 +437,9 @@
           >
             <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"
+                    v-model="dataForm.orderNo"
                     :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
diff --git a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
index a657382..b3089b4 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
+++ b/src/views/business/schedule/interchangeReceipt/receiptList-interface.ts
@@ -27,6 +27,7 @@
 export interface IReceiptDetail {
   interchangeCode: string // 交接单编号
   orderCode: string // 委托书编号
+  orderNo: string // 委托书编号
   orderId: string // 委托书id
   certificationCompany: string // 证书单位名称
   certificationCompanyFex: string // 传真
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index d35962f..79a112a 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -159,7 +159,15 @@
         :page-sizes="[5]"
         @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>
       <template #footer>
         <el-button type="primary" @click="clickConfirmSample">
           确定
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index c087472..3e19b31 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -15,6 +15,7 @@
 
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const isReceived = ref(false) // 样品状态是否已接收
 const visible = ref(false) // 控制选择委托方对话框显隐
 const sampleVisible = ref(false) // 控制选择样品对话框显隐
 const ruleFormRef = ref()
@@ -90,6 +91,10 @@
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
+  if ($route.params.status) {
+    isReceived.value = $route.params.status === '2'
+    console.log('样品砖淘', isReceived.value)
+  }
 }
 
 // 获取字典值
@@ -417,7 +422,7 @@
                     v-model="dataForm.deliverer"
                     :placeholder="pageType === 'detail' ? '' : '请输入送样人'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col><el-col :span="8">
@@ -426,7 +431,7 @@
                     v-model="dataForm.delivererTel"
                     :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -440,7 +445,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托日期'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                   />
                 </el-form-item>
               </el-col>
@@ -452,7 +457,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -466,7 +471,7 @@
                     class="full-width-input"
                     :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
                     :class="{ 'detail-input': pageType === 'detail' }"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
                   />
@@ -476,14 +481,16 @@
                 <el-form-item label="委托方代码" prop="customerNo">
                   <el-input
                     v-model="dataForm.customerNo"
-                    style="position: relative;"
                     :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
-                  />
-                  <el-button v-if="pageType !== 'detail'" class="selectBtn" size="mini" @click="customerNoFocus">
-                    选择
-                  </el-button>
+                  >
+                    <template v-if="pageType !== 'detail' && !isReceived" #append>
+                      <el-button size="small" @click="customerNoFocus">
+                        选择
+                      </el-button>
+                    </template>
+                  </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -522,7 +529,7 @@
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="证书类别:" prop="certifications">
-                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail'" class="full-width-input">
+                  <el-select v-model="dataForm.certifications" :placeholder="pageType === 'detail' ? '' : '请选择证书类别'" :disabled="pageType === 'detail' || isReceived" class="full-width-input">
                     <el-option
                       v-for="i in certificationsMap"
                       :key="i.value"
@@ -553,7 +560,7 @@
                     type="textarea"
                     autosize
                     :placeholder="pageType === 'detail' ? '' : '请输入备注'"
-                    :disabled="pageType === 'detail'"
+                    :disabled="pageType === 'detail' || isReceived"
                     :class="{ 'detail-input': pageType === 'detail' }"
                   />
                 </el-form-item>
@@ -566,7 +573,7 @@
                   <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
                   <span v-else-if="pageType === 'detail'">无</span>
                   <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-                  <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  <el-button v-if="pageType !== 'detail' && !isReceived" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
                     {{ dataForm.minioFileName === '' ? '上传' : '更换附件' }}
                   </el-button>
                 </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index fa8e6b0..d340091 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -260,7 +260,7 @@
   console.log(row)
 
   $router.push({
-    path: `/schedule/order/${pageType}/${row.id}`,
+    path: `/schedule/order/${pageType}/${row.id}/${row.status}`,
     // query: {
     //   statusName: row.statusName,
     // },
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index cbc4a70..0ada9c2 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -97,7 +97,8 @@
   processResult: string // 处理结果（设备领用、借用处理结果）
   remark: string // 备注
   taskId: string // 任务id（同意、驳回等操作使用）
-  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  checkDate: string | Date // 检修时间
+  time: string // 检修日期
   updateTime: string // 更新时间
   version: string // 版本号
 }
@@ -167,3 +168,12 @@
   value: string | number
   label?: string // 基本信息添加的信息名称
 }
+
+// 设备检修列表表头类型
+export interface IColumnsType {
+  text: string
+  value: string
+  align: string
+  width?: string
+  required: boolean
+}
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index eb2505d..e7f14c6 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -1,4 +1,4 @@
-<!-- 用户列表弹窗 -->
+<!-- 选择设备检修列表 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
 import { getUserList } from '@/api/system/user'
@@ -37,6 +37,7 @@
   {
     text: '检修申请编号',
     value: 'applyNo',
+    width: '160',
     align: 'center',
   },
   {
@@ -57,6 +58,7 @@
   {
     text: '检修时间',
     value: 'time',
+    width: '150',
     align: 'center',
   },
   {
@@ -70,9 +72,7 @@
     align: 'center',
   },
 ])
-const deptProps = reactive({
-  parent: 'pid', value: 'id', label: 'name', children: 'children',
-})
+
 // 获取部门
 const deptIdList = ref([])
 const getDeptList = () => {
@@ -83,7 +83,7 @@
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
-  // 获取设备检修列表已完成
+  // 获取设备检修列表
   getEquipmentApplyList(listQuery.value).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
@@ -97,7 +97,7 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    approvalStatus: '4',
+    approvalStatus: '4', // 已通过
     formId: SCHEDULE.DEVICE_FIX_APPROVAL,
     applyName: '',
     applyNo: '',
@@ -113,8 +113,8 @@
     offset: 1,
     limit: 5,
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  // selectTreeRef.value.clearSelected()
+  fetchData()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number;page?: number }) => {
@@ -126,8 +126,8 @@
   }
   search()
 }
-// 点击保存
-const submitForm = () => {
+// 确认
+const confirm = () => {
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
@@ -135,7 +135,7 @@
     reset()
   }
   else {
-    ElMessage.warning('请先选择人员')
+    ElMessage.warning('请选择')
   }
 }
 // 取消
@@ -154,7 +154,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="设备检修" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="设备检修" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
@@ -171,7 +171,12 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed="left">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label=" " width="55" align="center" fixed="left">
             <template #default="scope">
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
@@ -181,7 +186,7 @@
     </div>
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button type="primary" @click="confirm">确认</el-button>
         <el-button @click="resetForm">
           取消
         </el-button>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 20b635c..225f9a7 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,16 +1,21 @@
+<!-- 设备保养验收单列表 -->
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
 import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/measure/plan'
-import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
+import { deleteAcceptanceCheck, exportCheckList, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+import { cancelApproval } from '@/api/approval'
+import { getDictByCode } from '@/api/system/dict'
+
 const props = defineProps({
   status: {
     type: String,
@@ -28,6 +33,7 @@
 const operationWidth = computed(() => {
   return props.buttons.length * 40 + 24
 })
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 // 查询条件
 const listQuery = ref<IlistApprovalTypes>({
@@ -50,15 +56,13 @@
 const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
   {
     text: '验收单编号',
     value: 'applyNo',
     align: 'center',
-    width: '160',
+    width: '190',
   },
   {
     text: '验收单名称',
@@ -82,7 +86,7 @@
   },
   {
     text: '检修日期',
-    value: 'createTime',
+    value: 'checkDate',
     align: 'center',
     width: '120',
   },
@@ -94,14 +98,12 @@
 ])
 // 初始化路由
 const $router = useRouter()
-const buttonArray = ref<string[]>([])
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 装载时间数组
 const checkTime = ref<string>('')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
+// 获取数据
 const fetchData = (isNowPage: boolean) => {
   listQuery.value.checkStartDate = checkTime.value[0] || ''
   listQuery.value.checkEndDate = checkTime.value[1] || ''
@@ -111,7 +113,12 @@
     listQuery.value.offset = 1
   }
   getacceptanceCheckList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        checkDate: item.checkDate ? dayjs(item.checkDate).format('YYYY-MM-DD') : '',
+      }
+    })
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   }).catch((_) => {
@@ -123,7 +130,7 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除或者取消
+// 点击删除
 const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
@@ -145,12 +152,20 @@
     })
   })
 }
-
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+}
 // 取消
 const handleCancel = (row: IlistApproval) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '取消',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -160,16 +175,12 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
@@ -204,15 +215,39 @@
 const add = () => {
   $router.push('maintenanceCheckList/add')
 }
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
+
 // 导出
-const exportExcelBtn = () => {
+const exportAll = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (list.value.length > 0) {
+    const params = {
+      approvalStatus: props.status, // 审批状态
+      formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+      applyName: '', // 审批名称
+      applyNo: '', // 审批编号
+      applyType: '9', // 审批类型
+      businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+      checkApplyNo: '', // 检修申请编号
+      checkEndDate: '', // 检修结束时间
+      checkStartDate: '', // 检修开始时间
+      createUser: '', //  创建人
+      overhaulPerson: '', // 检修保养人
+      offset: 1, // 当前页
+      limit: 20, // 一页多少条
+      ids: checkoutList.value,
+    }
+    exportCheckList(params).then((res: any) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备检修保养验收单列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -228,20 +263,9 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval) => {
-  $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
+  $router.push(`maintenanceCheckList/detail/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
+
 // 提交
 const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -260,10 +284,7 @@
     })
   })
 }
-// 批量导出
-const exportAll = () => {
-  exportExcelBtn()
-}
+
 // 审批结束回调
 const approvalSuccess = () => {
   fetchData(true)
@@ -279,7 +300,8 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
+      $router.push(`maintenanceCheckList/edit/${row.id}/${row.approvalStatusName}/${row.processId}`)
+      // $router.push(`/maintenance/maintenanceCheckList/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -304,9 +326,9 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('maintenceCheckListApprovalMenu', newVal)
     fetchData(false)
-  },
-  { immediate: true })
+  })
 
 // 打印列表
 function printList() {
@@ -338,6 +360,17 @@
   cancel: '/device/maintenance/checkList/cancel', // 取消
   delete: '/device/maintenance/checkList/delete', // 删除
 }
+
+onMounted(async () => {
+  await getDict()
+  if (window.sessionStorage.getItem('maintenceCheckListApprovalMenu')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceCheckListApprovalMenu')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -377,25 +410,32 @@
       <search-item>
         <el-date-picker
           v-model="checkTime"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          start-placeholder="检查日期开始时间"
-          end-placeholder="检查日期结束时间"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="检修开始日期"
+          end-placeholder="检修结束日期"
         />
       </search-item>
     </search-area>
     <table-container>
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
           <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 18879cc..e59af7c 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,18 +1,19 @@
+<!-- 设备保养验收单详情 -->
 <script lang="ts" setup name="ListApprovalAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IlistApprovalAddTypes } from '../checkList_interface'
+import type { IColumnsType, IlistApprovalAddTypes, dictType } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
+import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, failUpdateAcceptanceCheckInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
-const loading = ref(false) // 表单加载状态
+
 const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
+const approvalStatusName = ref('') // 审批状态名称
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   add: '新建',
@@ -21,24 +22,28 @@
 }// 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
-console.log($route.meta.title)
+
+// ------------------------------------------- 路由参数 ----------------------------------
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交', '保存']
-  }
-  else {
-    buttonArray.value = ['提交', '保存']
-  }
+  // if (pageType.value === 'detail') {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  // else if (pageType.value === 'edit') {
+  //   buttonArray.value = ['提交', '保存']
+  // }
+  // else {
+  //   buttonArray.value = ['提交', '保存']
+  // }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
+  if ($route.params.approvalStatusName) {
+    approvalStatusName.value = $route.params.approvalStatusName as string
+  }
 }
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
+// 表单-包括表格数据
 const formInline = ref<IlistApprovalAddTypes>({
   acceptanceCheckId: '', // 检修申请id
   applyDesc: '', // 申请说明
@@ -76,52 +81,22 @@
   processResult: '', // 处理结果（设备领用、借用处理结果）
   remark: '', // 备注
   taskId: '', // 任务id（同意、驳回等操作使用）
-  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  checkDate: new Date(), // 检修日期
+  time: '', // 需要传的参数，检修日期
   updateTime: '', // 更新时间
   version: '', // 版本号
 })
-// 审批弹窗信息收集类型
-interface checkIdObjectType {
-  applyName: string
-  applyPersonName: string
-  time: string
-  applyNo: string
-}
+
 // 获取到检修申请列表数据
-const checkIdObject = ref<checkIdObjectType>({
+const checkIdObject = ref({
   applyName: '',
   applyPersonName: '',
-  time: '',
+  checkDate: '',
   applyNo: '',
 })
-// 检修设备列表数据
-const list = ref<object[]>([])
-// 审批弹窗开关
-const applyShow = ref(false)
-// 审批弹窗信息收集类型
-interface applyListType {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-// 审批弹窗信息收集
-const applyList = ref<applyListType>({
-  select: '',
-  epilog: '',
-  approval: '',
-  approvalTime: '',
-})
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  width?: string
-  required: boolean
-}
-// 标准配套设备更换表头
-const columns = ref<columnsType[]>([
+
+// 设备检修列表
+const columns = ref<IColumnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
@@ -132,6 +107,7 @@
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: '160',
     required: false,
   },
   {
@@ -149,23 +125,19 @@
   },
 ])
 const checkListRef = ref()
-// 检修申请编号按钮
+// 点击选择检修申请编号
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 下拉框列表类型
-interface optionsType {
-  name: string
-  id: string
-  value: string
-}
-// 检修结果下拉框
-const options = ref<optionsType[]>([])
 
+// ------------------------------------------ 字典 --------------------------------------
+// 检修结果下拉框
+const options = ref<dictType[]>([])
 // 获取检修结果
 getDictByCode('maintenanceResults').then((response) => {
   options.value = response.data
 })
+// --------------------------------------------------------------------------------------
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -177,7 +149,7 @@
   applyName: [{ required: true, message: '验收单名称不能为空', trigger: ['blur', 'change'] }],
   acceptanceCheckId: [{ required: true, message: '检修申请编号不能为空', trigger: ['blur', 'change'] }],
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
-  time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
+  checkDate: [{ required: true, message: '检修日期不能为空', trigger: ['blur', 'change'] }],
 })
 
 const onFileChange = (event: any) => {
@@ -203,19 +175,19 @@
 // 获取详情信息
 const getInfo = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
-    Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
-        res.data[item] = res.data[item].toString()
-      }
-    })
+    // Object.keys(res.data).map((item) => {
+    //   if (typeof (res.data[item]) === 'number') {
+    //     res.data[item] = res.data[item].toString()
+    //   }
+    // })
     checkIdObject.value.applyNo = res.data.checkApplyNo
     checkIdObject.value.applyName = res.data.checkApplyName
     formInline.value = res.data
+    formInline.value.equipmentList = res.data.checkList
+    formInline.value.applyType = '9'
   })
 }
-if (pageType.value !== 'add') {
-  getInfo()
-}
+
 const fileRef = ref() // 文件上传input
 
 // 点击上传文件按钮
@@ -229,8 +201,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -240,18 +212,15 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
+      close()
     })
+  })
 }
 const approvalDialog = ref()
-// 点击数据后的操作按钮
+// 审批操作-同意-驳回-拒绝-取消
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
     case '同意':
@@ -268,122 +237,122 @@
       break
   }
 }
+// 检查表格第几行信息未完善
+const checkEquipmentList = () => {
+  const index = formInline.value.equipmentList.findIndex((item: any) => !item.overhaulResult || !item.overhaulIdea)
+  if (index !== -1) {
+    return index + 1
+  }
+  else {
+    return 'pass'
+  }
+}
 // 保存后的id
 const addId = ref('')
-// 点击顶部一排按钮
-const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
-            formInline.value.fileList = []
-          }
+// 保存
+const save = async (formEl: FormInstance | undefined) => {
+  // 检查表格是否存在增加行信息没有完善的情况
+  const result = checkEquipmentList()
+  if (result !== 'pass') {
+    ElMessage.warning(`表格第${result}行信息未完善`)
+    return
+  }
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        formInline.value.time = formInline.value.checkDate
+        if (pageType.value === 'add') { // 新建
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
-              addId.value = res.data.id
+              addId.value = res.data
             }
           })
-        })
-      }
-    })
-  }
-  else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateAcceptanceCheckInfo(formInline.value).then((res) => {
-            if (res.code === 200) {
-              ElMessage.success('保存成功')
-              addId.value = res.data.id
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (item === '提交') {
-    if (addId.value === '') {
-      ElMessage.warning('请先保存')
-    }
-    else {
-      submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
-        if (res.code === 200) {
-          close()
+        }
+        else if (pageType.value === 'edit') { // 编辑
+          if (approvalStatusName.value === '未通过-驳回') {
+            failUpdateAcceptanceCheckInfo(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else { // 草稿箱和已取消
+            updateAcceptanceCheckInfo(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
         }
       })
     }
+  })
+}
+
+// 点击提交
+const submit = () => {
+  if (addId.value === '') {
+    ElMessage.warning('请先保存')
   }
   else {
-    clickBtn(item)
+    submitAcceptanceCheck({ id: addId.value, formId: SCHEDULE.DEVICE_FIX_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
   }
 }
 
-// 标准实验室发生改变row类型
-interface objectReturn {
-  id: string
-  applyName: string
-  applyPersonName: string
-  time: string
-  applyNo: string
-  equipmentId: string
-}
-// 选择完负责人的函数
-const confirmPerson = (object: objectReturn) => {
+// 选择完设备检修列表
+const confirmCheckList = (object: any) => {
   formInline.value.acceptanceCheckId = object.id
   checkIdObject.value = object
   // 获取到详情
-
   equipmentApplyInfo({ id: object.id }).then((res) => {
-    res.data.equipmentInfoList.map((item: objectReturn) => {
-      if (item.id) {
-        item.equipmentId = item.id
-      }
-      // 如果选择的没有id则就让装置数组置空
-      else {
-        return formInline.value.equipmentList = []
-      }
-    })
-    formInline.value.equipmentList = res.data.equipmentInfoList
+    if (res.data.equipmentInfoList.length) {
+      formInline.value.equipmentList = res.data.equipmentInfoList.map((item: any) => {
+        return {
+          ...item,
+          equipmentId: item.id,
+        }
+      })
+    }
   })
 }
-// 审批弹窗的关闭
-const applyListClose = () => {
-  applyShow.value = false
-}
-// 审批弹窗的提交
-const applyListSubmit = () => {
-  console.log(applyList.value)
-  if (applyList.value.select == '') {
-    return ElMessage.error('必须选择审批意见')
+
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (pageType.value !== 'add' && approvalStatusName.value !== '草稿箱') {
+    if (processId) {
+      fetchApproval(processId).then((res) => {
+        approvalRecordData.value = res.data
+      })
+    }
+    else {
+      ElMessage.warning('流程实例id为空')
+    }
   }
-  applyListClose()
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
 }
 onMounted(async () => {
   formInline.value.processId = $route.params.processId as string // 任务id
+  // 编辑和详情页面获取详情信息
+  if (pageType.value !== 'add') {
+    getInfo() // 获取详情信息
+    getApprovalRecord(formInline.value.processId) // 获取审批流程
+  }
 })
 </script>
 
@@ -391,8 +360,14 @@
   <app-container>
     <detail-page :title="`${$route.meta.title}-${textMap[pageType]}`">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
+        <!-- <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(item, ruleFormRef)">
           {{ item }}
+        </el-button> -->
+        <el-button v-if="pageType === 'add'" type="primary" @click="submit">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="save(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -465,10 +440,10 @@
           <el-col :span="6">
             <el-form-item
               label="检修日期:"
-              prop="time"
+              prop="checkDate"
             >
               <el-date-picker
-                v-model="formInline.time"
+                v-model="formInline.checkDate"
                 style="width: 100%;"
                 type="date"
                 :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
@@ -497,7 +472,7 @@
               <span v-else-if="pageType === 'detail'">无</span>
               <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
               <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.fileList.length && formInline.fileList[0].minioFileName === '' ? '0px' : '20px' }" @click="upload">
-                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '上传' : '更换附件' }}
+                {{ formInline.fileList.length && formInline.fileList[0].minioFileName ? '更换附件' : '上传' }}
               </el-button>
             </el-form-item>
           </el-col>
@@ -527,22 +502,22 @@
             >
               <el-option
                 v-for="item in options"
-                :key="item.id"
+                :key="item.value"
                 :label="item.name"
-                :value="item.id"
+                :value="item.value"
               />
             </el-select>
           </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
       <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-    <!-- 选择用户列表组件 -->
-    <check-list ref="checkListRef" @add="confirmPerson" />
+    <!-- 选择设备检修列表 -->
+    <check-list ref="checkListRef" @add="confirmCheckList" />
   </app-container>
 </template>
 
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 1d17f4c..5a76153 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -1,22 +1,18 @@
-<script lang="ts" setup name="approve">
+<!-- 设备保养验收单列表 -->
+<script lang="ts" setup name="MaintenanceCheckList">
 import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton, dictType } from './checkList_interface'
 import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
+import { getDictByCode } from '@/api/system/dict'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
+    // { name: '同意', type: 'primary' },
+    // { name: '驳回', type: 'primary' },
+    // { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
@@ -47,19 +43,13 @@
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+const menus = ref<IMenu[]>([]) // 右上角审批状态按钮组合
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
@@ -69,6 +59,8 @@
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
 const approvalStatusList = dictStore.getApprovalStatus
+// 审批类型字典
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 
 const $route = useRoute()
 if ($route.query && $route.query.type) {
@@ -77,20 +69,45 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 获取字典值
+async function getDict() {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
-  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+  // sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
-  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
-  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue] || '0'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
@@ -114,7 +131,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 98b01f2..daca294 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -240,8 +240,15 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="140">
+          <el-table-column label="操作" align="center" width="110">
             <template #default="{ row }">
               <el-button
                 size="small"
diff --git "a/\350\256\241\351\207\217 \0502\051.zip" "b/\350\256\241\351\207\217 \0502\051.zip"
deleted file mode 100644
index dfca0ba..0000000
--- "a/\350\256\241\351\207\217 \0502\051.zip"
+++ /dev/null
Binary files differ
diff --git "a/\350\256\241\351\207\217.zip" "b/\350\256\241\351\207\217.zip"
deleted file mode 100644
index 3a3060c..0000000
--- "a/\350\256\241\351\207\217.zip"
+++ /dev/null
Binary files differ