diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index b21f20d..68eb8a8 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -35,7 +35,7 @@
 // 根据样品id催办
 export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/rushDoProcess',
+    url: '/device/dispatch/remindWorker',
     method: 'post',
     data,
   })

diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index b21f20d..68eb8a8 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -35,7 +35,7 @@
 // 根据样品id催办
 export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/rushDoProcess',
+    url: '/device/dispatch/remindWorker',
     method: 'post',
     data,
   })
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fdcca51..e82a99e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -69,9 +69,9 @@
 }
 
 // 查询检定证书
-export function getCertification(data: { id: string }) {
+export function getCertification(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/certificationBySampleId`,
+    url: '/business/certificateReport/certificateRecordsById',
     method: 'post',
     data,
   })

diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index b21f20d..68eb8a8 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -35,7 +35,7 @@
 // 根据样品id催办
 export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/rushDoProcess',
+    url: '/device/dispatch/remindWorker',
     method: 'post',
     data,
   })
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fdcca51..e82a99e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -69,9 +69,9 @@
 }
 
 // 查询检定证书
-export function getCertification(data: { id: string }) {
+export function getCertification(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/certificationBySampleId`,
+    url: '/business/certificateReport/certificateRecordsById',
     method: 'post',
     data,
   })
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index 15ce154..789505f 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -121,9 +121,9 @@
 // 获取检定证书
 const fetchCertifications = (query = null) => {
   if (pageType.value === 'detail') {
-    // getCertification({ id: infoId.value }).then((res) => {
-    //   dataList.value.certificationRecords = res.data.rows
-    // })
+    getCertification({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.certificationRecords = res.data.rows
+    })
   }
 }
 
@@ -148,7 +148,7 @@
     columns: [
       { text: '证书编号', value: 'certificationCode', align: 'center' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
       { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
       { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],

diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index b21f20d..68eb8a8 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -35,7 +35,7 @@
 // 根据样品id催办
 export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/rushDoProcess',
+    url: '/device/dispatch/remindWorker',
     method: 'post',
     data,
   })
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fdcca51..e82a99e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -69,9 +69,9 @@
 }
 
 // 查询检定证书
-export function getCertification(data: { id: string }) {
+export function getCertification(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/certificationBySampleId`,
+    url: '/business/certificateReport/certificateRecordsById',
     method: 'post',
     data,
   })
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index 15ce154..789505f 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -121,9 +121,9 @@
 // 获取检定证书
 const fetchCertifications = (query = null) => {
   if (pageType.value === 'detail') {
-    // getCertification({ id: infoId.value }).then((res) => {
-    //   dataList.value.certificationRecords = res.data.rows
-    // })
+    getCertification({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.certificationRecords = res.data.rows
+    })
   }
 }
 
@@ -148,7 +148,7 @@
     columns: [
       { text: '证书编号', value: 'certificationCode', align: 'center' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
       { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
       { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index f6c0768..8cb05c0 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -155,7 +155,7 @@
       return {
         ...item,
         Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
-        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+        sampleBelong: `${item.sampleBelong}` === '1' ? '自有设备' : '客户样品',
       }
     })
     total.value = parseInt(response.data.total)
@@ -318,8 +318,8 @@
           }
         })
       }
-      else if (type === 'urge') { // 催办 ------------------- 后端未开发完
-        interchangeListUrge({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+      else if (type === 'urge') { // 催办
+        interchangeListUrge({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -418,8 +418,8 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="预计送达开始时间"
             end-placeholder="预计送达结束时间"
           />
@@ -542,8 +542,9 @@
               >
                 回退
               </el-button>
+              <!-- isSelfMeasure: true自检，false外包，外包不允许催办 -->
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === '已超期'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === '已超期' && row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"
@@ -552,7 +553,7 @@
                 催办
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/terminate')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/terminate') && currentMenu !== '待归还' && currentMenu !== '已归还' && currentMenu !== '待收入'"
                 size="small"
                 link
                 type="danger"

diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index b21f20d..68eb8a8 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -35,7 +35,7 @@
 // 根据样品id催办
 export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/rushDoProcess',
+    url: '/device/dispatch/remindWorker',
     method: 'post',
     data,
   })
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fdcca51..e82a99e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -69,9 +69,9 @@
 }
 
 // 查询检定证书
-export function getCertification(data: { id: string }) {
+export function getCertification(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/certificationBySampleId`,
+    url: '/business/certificateReport/certificateRecordsById',
     method: 'post',
     data,
   })
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index 15ce154..789505f 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -121,9 +121,9 @@
 // 获取检定证书
 const fetchCertifications = (query = null) => {
   if (pageType.value === 'detail') {
-    // getCertification({ id: infoId.value }).then((res) => {
-    //   dataList.value.certificationRecords = res.data.rows
-    // })
+    getCertification({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.certificationRecords = res.data.rows
+    })
   }
 }
 
@@ -148,7 +148,7 @@
     columns: [
       { text: '证书编号', value: 'certificationCode', align: 'center' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
       { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
       { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index f6c0768..8cb05c0 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -155,7 +155,7 @@
       return {
         ...item,
         Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
-        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+        sampleBelong: `${item.sampleBelong}` === '1' ? '自有设备' : '客户样品',
       }
     })
     total.value = parseInt(response.data.total)
@@ -318,8 +318,8 @@
           }
         })
       }
-      else if (type === 'urge') { // 催办 ------------------- 后端未开发完
-        interchangeListUrge({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+      else if (type === 'urge') { // 催办
+        interchangeListUrge({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -418,8 +418,8 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="预计送达开始时间"
             end-placeholder="预计送达结束时间"
           />
@@ -542,8 +542,9 @@
               >
                 回退
               </el-button>
+              <!-- isSelfMeasure: true自检，false外包，外包不允许催办 -->
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === '已超期'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === '已超期' && row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"
@@ -552,7 +553,7 @@
                 催办
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/terminate')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/terminate') && currentMenu !== '待归还' && currentMenu !== '已归还' && currentMenu !== '待收入'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 2eed09b..c629542 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -66,7 +66,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -437,9 +437,9 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderNo">
+                <el-form-item label="委托书编号:" prop="orderCode">
                   <el-input
-                    v-model="dataForm.orderNo"
+                    v-model="dataForm.orderCode"
                     :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled

diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index b21f20d..68eb8a8 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -35,7 +35,7 @@
 // 根据样品id催办
 export function interchangeListUrge(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/rushDoProcess',
+    url: '/device/dispatch/remindWorker',
     method: 'post',
     data,
   })
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fdcca51..e82a99e 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -69,9 +69,9 @@
 }
 
 // 查询检定证书
-export function getCertification(data: { id: string }) {
+export function getCertification(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/certificationBySampleId`,
+    url: '/business/certificateReport/certificateRecordsById',
     method: 'post',
     data,
   })
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index 15ce154..789505f 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -121,9 +121,9 @@
 // 获取检定证书
 const fetchCertifications = (query = null) => {
   if (pageType.value === 'detail') {
-    // getCertification({ id: infoId.value }).then((res) => {
-    //   dataList.value.certificationRecords = res.data.rows
-    // })
+    getCertification({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.certificationRecords = res.data.rows
+    })
   }
 }
 
@@ -148,7 +148,7 @@
     columns: [
       { text: '证书编号', value: 'certificationCode', align: 'center' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
       { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
       { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index f6c0768..8cb05c0 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -155,7 +155,7 @@
       return {
         ...item,
         Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
-        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+        sampleBelong: `${item.sampleBelong}` === '1' ? '自有设备' : '客户样品',
       }
     })
     total.value = parseInt(response.data.total)
@@ -318,8 +318,8 @@
           }
         })
       }
-      else if (type === 'urge') { // 催办 ------------------- 后端未开发完
-        interchangeListUrge({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '2' }).then((res) => {
+      else if (type === 'urge') { // 催办
+        interchangeListUrge({ orderId: row.orderId, reason: '', sampleId: row.sampleId, status: '' }).then((res) => {
           if (res.code === 200) {
             ElMessage.success(`已${title}`)
             fetchData(true)
@@ -418,8 +418,8 @@
             v-model="timeRange"
             type="datetimerange"
             range-separator="到"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="预计送达开始时间"
             end-placeholder="预计送达结束时间"
           />
@@ -542,8 +542,9 @@
               >
                 回退
               </el-button>
+              <!-- isSelfMeasure: true自检，false外包，外包不允许催办 -->
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === '已超期'"
+                v-if="proxy.hasPerm('/schedule/interchangeList/urge') && currentMenu === '已超期' && row.isSelfMeasure"
                 size="small"
                 link
                 type="primary"
@@ -552,7 +553,7 @@
                 催办
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/interchangeList/terminate')"
+                v-if="proxy.hasPerm('/schedule/interchangeList/terminate') && currentMenu !== '待归还' && currentMenu !== '已归还' && currentMenu !== '待收入'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 2eed09b..c629542 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -66,7 +66,7 @@
 })
 // 表单验证规则
 const rules = reactive<FormRules>({
-  orderNo: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
+  orderCode: [{ required: true, message: '要求委托书编号不能为空', trigger: 'blur,change' }],
   certificationCompany: [{ required: true, message: '要求证书单位名称不能为空', trigger: 'blur' }],
   certificationCompanyFex: [{ required: true, message: '要求证书单位传真不能为空', trigger: 'blur' }],
   certificationCompanyEmail: [{ required: true, message: '要求证书单位邮编不能为空', trigger: 'blur' }],
@@ -437,9 +437,9 @@
           >
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="委托书编号:" prop="orderNo">
+                <el-form-item label="委托书编号:" prop="orderCode">
                   <el-input
-                    v-model="dataForm.orderNo"
+                    v-model="dataForm.orderCode"
                     :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
                     :class="{ 'detail-input': pageType === 'detail' }"
                     disabled
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index b6e9683..207aaff 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -121,9 +121,9 @@
 // 获取检定证书
 const fetchCertifications = (query = null) => {
   if (pageType.value === 'detail') {
-    // getCertification({ id: infoId.value }).then((res) => {
-    //   dataList.value.certificationRecords = res.data.rows
-    // })
+    getCertification({ sampleId: infoId.value, customerId: '' }).then((res) => {
+      dataList.value.certificationRecords = res.data.rows
+    })
   }
 }
 
@@ -148,7 +148,7 @@
     columns: [
       { text: '证书编号', value: 'certificationCode', align: 'center' },
       { text: '证书名称', value: 'certificationName', align: 'center' },
-      { text: '证书类型', value: 'certificationType', align: 'center' },
+      { text: '证书类型', value: 'certificationClassName', align: 'center' },
       { text: '证书出具日期', value: 'effectiveDate', align: 'center' },
       { text: '证书有效期', value: 'expirationDate', align: 'center' },
     ],