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/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 98a2567..3ecc313 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -75,7 +75,6 @@
     }
   })
 }
-getDict()
 
 const $route = useRoute()
 // 路由参数
@@ -85,10 +84,19 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 挂载的时候找到之前存过的审批类型
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('reportOnCredentialsApproval') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>

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/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 98a2567..3ecc313 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -75,7 +75,6 @@
     }
   })
 }
-getDict()
 
 const $route = useRoute()
 // 路由参数
@@ -85,10 +84,19 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 挂载的时候找到之前存过的审批类型
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('reportOnCredentialsApproval') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 9805617..f1031aa 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -47,6 +47,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 表格数据
 const list = ref<IList[]>([])
 // 总数
@@ -77,6 +78,13 @@
   // 校检类别
   const response = await getDictByCode('measureCategory')
   mesureCategoryList.value = response.data
+
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 }
 // 获取列表数据
 const fetchData = (isNowPage: boolean) => {
@@ -269,12 +277,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (() => props.status, (newVal, oldVal) => {
-  listQuery.value.approvalStatus = newVal!
-  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
-  fetchData(true)
-},
-// { immediate: true },
+watch (
+  () => props.status,
+  (newVal) => {
+    listQuery.value.approvalStatus = newVal!
+    window.sessionStorage.setItem('reportOnCredentials', newVal!)
+    // fetchData(true)
+    fetchData(false)
+  },
 )
 
 // 打印列表
@@ -300,7 +310,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典
-  fetchData(true) // 获取列表数据
+  if (window.sessionStorage.getItem('reportOnCredentials')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('reportOnCredentials')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 

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/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 98a2567..3ecc313 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -75,7 +75,6 @@
     }
   })
 }
-getDict()
 
 const $route = useRoute()
 // 路由参数
@@ -85,10 +84,19 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 挂载的时候找到之前存过的审批类型
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('reportOnCredentialsApproval') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 9805617..f1031aa 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -47,6 +47,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 表格数据
 const list = ref<IList[]>([])
 // 总数
@@ -77,6 +78,13 @@
   // 校检类别
   const response = await getDictByCode('measureCategory')
   mesureCategoryList.value = response.data
+
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 }
 // 获取列表数据
 const fetchData = (isNowPage: boolean) => {
@@ -269,12 +277,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (() => props.status, (newVal, oldVal) => {
-  listQuery.value.approvalStatus = newVal!
-  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
-  fetchData(true)
-},
-// { immediate: true },
+watch (
+  () => props.status,
+  (newVal) => {
+    listQuery.value.approvalStatus = newVal!
+    window.sessionStorage.setItem('reportOnCredentials', newVal!)
+    // fetchData(true)
+    fetchData(false)
+  },
 )
 
 // 打印列表
@@ -300,7 +310,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典
-  fetchData(true) // 获取列表数据
+  if (window.sessionStorage.getItem('reportOnCredentials')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('reportOnCredentials')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
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/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 98a2567..3ecc313 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -75,7 +75,6 @@
     }
   })
 }
-getDict()
 
 const $route = useRoute()
 // 路由参数
@@ -85,10 +84,19 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 挂载的时候找到之前存过的审批类型
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('reportOnCredentialsApproval') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 9805617..f1031aa 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -47,6 +47,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 表格数据
 const list = ref<IList[]>([])
 // 总数
@@ -77,6 +78,13 @@
   // 校检类别
   const response = await getDictByCode('measureCategory')
   mesureCategoryList.value = response.data
+
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 }
 // 获取列表数据
 const fetchData = (isNowPage: boolean) => {
@@ -269,12 +277,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (() => props.status, (newVal, oldVal) => {
-  listQuery.value.approvalStatus = newVal!
-  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
-  fetchData(true)
-},
-// { immediate: true },
+watch (
+  () => props.status,
+  (newVal) => {
+    listQuery.value.approvalStatus = newVal!
+    window.sessionStorage.setItem('reportOnCredentials', newVal!)
+    // fetchData(true)
+    fetchData(false)
+  },
 )
 
 // 打印列表
@@ -300,7 +310,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典
-  fetchData(true) // 获取列表数据
+  if (window.sessionStorage.getItem('reportOnCredentials')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('reportOnCredentials')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
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 1349989..61ca5e5 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -48,11 +48,11 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', 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: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
@@ -61,12 +61,12 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', align: 'center' },
   { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -155,7 +155,8 @@
       return {
         ...item,
         Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
-        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+        sampleBelong: `${item.sampleBelong}` === '1' ? '自有设备' : '客户样品',
+        isUrgentName: item.isUrgent == 1 ? '是' : '否',
       }
     })
     total.value = parseInt(response.data.total)
@@ -318,8 +319,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)
@@ -542,8 +543,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 +554,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/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 98a2567..3ecc313 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -75,7 +75,6 @@
     }
   })
 }
-getDict()
 
 const $route = useRoute()
 // 路由参数
@@ -85,10 +84,19 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 挂载的时候找到之前存过的审批类型
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('reportOnCredentialsApproval') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 9805617..f1031aa 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -47,6 +47,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 表格数据
 const list = ref<IList[]>([])
 // 总数
@@ -77,6 +78,13 @@
   // 校检类别
   const response = await getDictByCode('measureCategory')
   mesureCategoryList.value = response.data
+
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 }
 // 获取列表数据
 const fetchData = (isNowPage: boolean) => {
@@ -269,12 +277,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (() => props.status, (newVal, oldVal) => {
-  listQuery.value.approvalStatus = newVal!
-  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
-  fetchData(true)
-},
-// { immediate: true },
+watch (
+  () => props.status,
+  (newVal) => {
+    listQuery.value.approvalStatus = newVal!
+    window.sessionStorage.setItem('reportOnCredentials', newVal!)
+    // fetchData(true)
+    fetchData(false)
+  },
 )
 
 // 打印列表
@@ -300,7 +310,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典
-  fetchData(true) // 获取列表数据
+  if (window.sessionStorage.getItem('reportOnCredentials')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('reportOnCredentials')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
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 1349989..61ca5e5 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -48,11 +48,11 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', 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: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
@@ -61,12 +61,12 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', align: 'center' },
   { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -155,7 +155,8 @@
       return {
         ...item,
         Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
-        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+        sampleBelong: `${item.sampleBelong}` === '1' ? '自有设备' : '客户样品',
+        isUrgentName: item.isUrgent == 1 ? '是' : '否',
       }
     })
     total.value = parseInt(response.data.total)
@@ -318,8 +319,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)
@@ -542,8 +543,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 +554,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/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts
index e5140a4..f1a3f91 100644
--- a/src/views/business/schedule/interchange/interchange_interface.ts
+++ b/src/views/business/schedule/interchange/interchange_interface.ts
@@ -24,7 +24,7 @@
   customerId: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送检人
-  isUrgent: string // 是否加急
+  isUrgent: number | string // 是否加急
   sampleBelong: string // 样品属性
   planDeliverTime: string // 预计送达时间
   deliverTime: string // 实际送达时间

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/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 98a2567..3ecc313 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -75,7 +75,6 @@
     }
   })
 }
-getDict()
 
 const $route = useRoute()
 // 路由参数
@@ -85,10 +84,19 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 挂载的时候找到之前存过的审批类型
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('reportOnCredentialsApproval') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 9805617..f1031aa 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -47,6 +47,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 表格数据
 const list = ref<IList[]>([])
 // 总数
@@ -77,6 +78,13 @@
   // 校检类别
   const response = await getDictByCode('measureCategory')
   mesureCategoryList.value = response.data
+
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 }
 // 获取列表数据
 const fetchData = (isNowPage: boolean) => {
@@ -269,12 +277,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (() => props.status, (newVal, oldVal) => {
-  listQuery.value.approvalStatus = newVal!
-  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
-  fetchData(true)
-},
-// { immediate: true },
+watch (
+  () => props.status,
+  (newVal) => {
+    listQuery.value.approvalStatus = newVal!
+    window.sessionStorage.setItem('reportOnCredentials', newVal!)
+    // fetchData(true)
+    fetchData(false)
+  },
 )
 
 // 打印列表
@@ -300,7 +310,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典
-  fetchData(true) // 获取列表数据
+  if (window.sessionStorage.getItem('reportOnCredentials')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('reportOnCredentials')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
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 1349989..61ca5e5 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -48,11 +48,11 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', 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: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
@@ -61,12 +61,12 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', align: 'center' },
   { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -155,7 +155,8 @@
       return {
         ...item,
         Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
-        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+        sampleBelong: `${item.sampleBelong}` === '1' ? '自有设备' : '客户样品',
+        isUrgentName: item.isUrgent == 1 ? '是' : '否',
       }
     })
     total.value = parseInt(response.data.total)
@@ -318,8 +319,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)
@@ -542,8 +543,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 +554,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/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts
index e5140a4..f1a3f91 100644
--- a/src/views/business/schedule/interchange/interchange_interface.ts
+++ b/src/views/business/schedule/interchange/interchange_interface.ts
@@ -24,7 +24,7 @@
   customerId: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送检人
-  isUrgent: string // 是否加急
+  isUrgent: number | string // 是否加急
   sampleBelong: string // 样品属性
   planDeliverTime: string // 预计送达时间
   deliverTime: string // 实际送达时间
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/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 98a2567..3ecc313 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -75,7 +75,6 @@
     }
   })
 }
-getDict()
 
 const $route = useRoute()
 // 路由参数
@@ -85,10 +84,19 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 挂载的时候找到之前存过的审批类型
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('reportOnCredentialsApproval') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 9805617..f1031aa 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -47,6 +47,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 表格数据
 const list = ref<IList[]>([])
 // 总数
@@ -77,6 +78,13 @@
   // 校检类别
   const response = await getDictByCode('measureCategory')
   mesureCategoryList.value = response.data
+
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 }
 // 获取列表数据
 const fetchData = (isNowPage: boolean) => {
@@ -269,12 +277,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (() => props.status, (newVal, oldVal) => {
-  listQuery.value.approvalStatus = newVal!
-  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
-  fetchData(true)
-},
-// { immediate: true },
+watch (
+  () => props.status,
+  (newVal) => {
+    listQuery.value.approvalStatus = newVal!
+    window.sessionStorage.setItem('reportOnCredentials', newVal!)
+    // fetchData(true)
+    fetchData(false)
+  },
 )
 
 // 打印列表
@@ -300,7 +310,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典
-  fetchData(true) // 获取列表数据
+  if (window.sessionStorage.getItem('reportOnCredentials')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('reportOnCredentials')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
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 1349989..61ca5e5 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -48,11 +48,11 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', 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: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
@@ -61,12 +61,12 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', align: 'center' },
   { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -155,7 +155,8 @@
       return {
         ...item,
         Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
-        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+        sampleBelong: `${item.sampleBelong}` === '1' ? '自有设备' : '客户样品',
+        isUrgentName: item.isUrgent == 1 ? '是' : '否',
       }
     })
     total.value = parseInt(response.data.total)
@@ -318,8 +319,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)
@@ -542,8 +543,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 +554,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/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts
index e5140a4..f1a3f91 100644
--- a/src/views/business/schedule/interchange/interchange_interface.ts
+++ b/src/views/business/schedule/interchange/interchange_interface.ts
@@ -24,7 +24,7 @@
   customerId: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送检人
-  isUrgent: string // 是否加急
+  isUrgent: number | string // 是否加急
   sampleBelong: string // 样品属性
   planDeliverTime: string // 预计送达时间
   deliverTime: string // 实际送达时间
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/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index d340091..e674b32 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -40,7 +40,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100px', styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
@@ -101,7 +101,13 @@
     listQuery.value.offset = 1
   }
   getOrderList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOrderList) => {
+      return {
+        ...item,
+        isUrgentName: item.isUrgent == 1 ? '是' : '否',
+      }
+    })
+
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })

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/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 98a2567..3ecc313 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -75,7 +75,6 @@
     }
   })
 }
-getDict()
 
 const $route = useRoute()
 // 路由参数
@@ -85,10 +84,19 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 挂载的时候找到之前存过的审批类型
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('reportOnCredentialsApproval') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 9805617..f1031aa 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -47,6 +47,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 表格数据
 const list = ref<IList[]>([])
 // 总数
@@ -77,6 +78,13 @@
   // 校检类别
   const response = await getDictByCode('measureCategory')
   mesureCategoryList.value = response.data
+
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 }
 // 获取列表数据
 const fetchData = (isNowPage: boolean) => {
@@ -269,12 +277,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (() => props.status, (newVal, oldVal) => {
-  listQuery.value.approvalStatus = newVal!
-  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
-  fetchData(true)
-},
-// { immediate: true },
+watch (
+  () => props.status,
+  (newVal) => {
+    listQuery.value.approvalStatus = newVal!
+    window.sessionStorage.setItem('reportOnCredentials', newVal!)
+    // fetchData(true)
+    fetchData(false)
+  },
 )
 
 // 打印列表
@@ -300,7 +310,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典
-  fetchData(true) // 获取列表数据
+  if (window.sessionStorage.getItem('reportOnCredentials')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('reportOnCredentials')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
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 1349989..61ca5e5 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -48,11 +48,11 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', 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: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
@@ -61,12 +61,12 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', align: 'center' },
   { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -155,7 +155,8 @@
       return {
         ...item,
         Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
-        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+        sampleBelong: `${item.sampleBelong}` === '1' ? '自有设备' : '客户样品',
+        isUrgentName: item.isUrgent == 1 ? '是' : '否',
       }
     })
     total.value = parseInt(response.data.total)
@@ -318,8 +319,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)
@@ -542,8 +543,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 +554,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/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts
index e5140a4..f1a3f91 100644
--- a/src/views/business/schedule/interchange/interchange_interface.ts
+++ b/src/views/business/schedule/interchange/interchange_interface.ts
@@ -24,7 +24,7 @@
   customerId: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送检人
-  isUrgent: string // 是否加急
+  isUrgent: number | string // 是否加急
   sampleBelong: string // 样品属性
   planDeliverTime: string // 预计送达时间
   deliverTime: string // 实际送达时间
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/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index d340091..e674b32 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -40,7 +40,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100px', styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
@@ -101,7 +101,13 @@
     listQuery.value.offset = 1
   }
   getOrderList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOrderList) => {
+      return {
+        ...item,
+        isUrgentName: item.isUrgent == 1 ? '是' : '否',
+      }
+    })
+
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
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' },
     ],

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/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 98a2567..3ecc313 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -75,7 +75,6 @@
     }
   })
 }
-getDict()
 
 const $route = useRoute()
 // 路由参数
@@ -85,10 +84,19 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 挂载的时候找到之前存过的审批类型
+onMounted(async () => {
+  await getDict()
+  currentTab.value = window.sessionStorage.getItem('reportOnCredentialsApproval') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+}, { deep: true })
 </script>
 
 <template>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 9805617..f1031aa 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -47,6 +47,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 // 表格数据
 const list = ref<IList[]>([])
 // 总数
@@ -77,6 +78,13 @@
   // 校检类别
   const response = await getDictByCode('measureCategory')
   mesureCategoryList.value = response.data
+
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
 }
 // 获取列表数据
 const fetchData = (isNowPage: boolean) => {
@@ -269,12 +277,14 @@
 }
 
 // 监听status变化，更新approvalStatus
-watch (() => props.status, (newVal, oldVal) => {
-  listQuery.value.approvalStatus = newVal!
-  console.log('change status--', newVal, oldVal, listQuery.value.approvalStatus)
-  fetchData(true)
-},
-// { immediate: true },
+watch (
+  () => props.status,
+  (newVal) => {
+    listQuery.value.approvalStatus = newVal!
+    window.sessionStorage.setItem('reportOnCredentials', newVal!)
+    // fetchData(true)
+    fetchData(false)
+  },
 )
 
 // 打印列表
@@ -300,7 +310,13 @@
 
 onMounted(async () => {
   await getDict() // 获取字典
-  fetchData(true) // 获取列表数据
+  if (window.sessionStorage.getItem('reportOnCredentials')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('reportOnCredentials')!
+  }
+  else {
+    listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+  }
+  fetchData(true)
 })
 </script>
 
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 1349989..61ca5e5 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -48,11 +48,11 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', 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: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
@@ -61,12 +61,12 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', align: 'center' },
   { text: '委托方代码', value: 'customerNo', width: '160', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'realDeliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '55px', styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleBelong', align: 'center', width: '90px' },
   { text: '当前检定环节', value: 'currentSegment', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -155,7 +155,8 @@
       return {
         ...item,
         Certifications: item.alreadyCertifications === item.requireCertifications ? item.requireCertifications : (`${item.alreadyCertifications}/${item.requireCertifications}`),
-        sampleBelong: `${item.sampleBelong}` === '1' ? '客户样品' : '自有设备',
+        sampleBelong: `${item.sampleBelong}` === '1' ? '自有设备' : '客户样品',
+        isUrgentName: item.isUrgent == 1 ? '是' : '否',
       }
     })
     total.value = parseInt(response.data.total)
@@ -318,8 +319,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)
@@ -542,8 +543,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 +554,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/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts
index e5140a4..f1a3f91 100644
--- a/src/views/business/schedule/interchange/interchange_interface.ts
+++ b/src/views/business/schedule/interchange/interchange_interface.ts
@@ -24,7 +24,7 @@
   customerId: string // 委托方代码
   customerName: string // 委托方名称
   deliverer: string // 送检人
-  isUrgent: string // 是否加急
+  isUrgent: number | string // 是否加急
   sampleBelong: string // 样品属性
   planDeliverTime: string // 预计送达时间
   deliverTime: string // 实际送达时间
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/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index d340091..e674b32 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -40,7 +40,7 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  { text: '是否加急', value: 'isUrgentName', align: 'center', width: '100px', styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
   { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
@@ -101,7 +101,13 @@
     listQuery.value.offset = 1
   }
   getOrderList(listQuery.value).then((response) => {
-    list.value = response.data.rows
+    list.value = response.data.rows.map((item: IOrderList) => {
+      return {
+        ...item,
+        isUrgentName: item.isUrgent == 1 ? '是' : '否',
+      }
+    })
+
     total.value = parseInt(response.data.total)
     loadingTable.value = false
   })
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' },
     ],
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index e59af7c..319f2c7 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -496,7 +496,7 @@
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
               clearable
-              placeholder="计划编号"
+              placeholder="请选择计划编号"
               size="default"
               :disabled="pageType === 'detail'"
             >