diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 8223e4c..073c90f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -136,7 +136,7 @@
 export function getPdfStream(fileName: string) {
   return request({
     url: `/minio/file/download/stream?fileName=${fileName}`,
-    method: 'post',
+    method: 'get',
     responseType: 'blob',
   })
 }

diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 8223e4c..073c90f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -136,7 +136,7 @@
 export function getPdfStream(fileName: string) {
   return request({
     url: `/minio/file/download/stream?fileName=${fileName}`,
-    method: 'post',
+    method: 'get',
     responseType: 'blob',
   })
 }
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index e91f580..151ac41 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="CertificationMonitor">
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateMonitorsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -26,14 +28,14 @@
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
-  { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
-  { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
-  { text: '完成时间', value: 'text', align: 'center', width: '180' },
-  { text: '退回次数', value: 'text', align: 'center' },
-  { text: '制作人', value: 'text', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', align: 'center', width: '160' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
+  { text: '证书状态', value: 'certificateStatus', align: 'center' },
+  { text: '初次提交审核时间', value: 'submitTime', align: 'center', width: '180' },
+  { text: '完成时间', value: 'finishedTime', align: 'center', width: '180' },
+  { text: '退回次数', value: 'returns', align: 'center' },
+  { text: '制作人', value: 'createUser', align: 'center' },
 ])
 
 // 应出具证书数
@@ -45,6 +47,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -53,22 +68,28 @@
   }
   loading.value = true
   list.value = []
-  console.log('99999999', searchQuery.value, props.sampleId, props.customerId)
   searchQuery.value.customerId = props.customerId
   searchQuery.value.sampleId = props.sampleId
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: { certificationClass: string }) => {
+      return {
+        ...item,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-watch(() => props.sampleId, () => {
+watch(() => props.sampleId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
-watch(() => props.customerId, () => {
+watch(() => props.customerId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
@@ -83,8 +104,10 @@
   }
   fetchData(true)
 }
-onMounted(() => {
+onMounted(async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
+
     fetchData()
   }
 })

diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 8223e4c..073c90f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -136,7 +136,7 @@
 export function getPdfStream(fileName: string) {
   return request({
     url: `/minio/file/download/stream?fileName=${fileName}`,
-    method: 'post',
+    method: 'get',
     responseType: 'blob',
   })
 }
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index e91f580..151ac41 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="CertificationMonitor">
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateMonitorsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -26,14 +28,14 @@
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
-  { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
-  { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
-  { text: '完成时间', value: 'text', align: 'center', width: '180' },
-  { text: '退回次数', value: 'text', align: 'center' },
-  { text: '制作人', value: 'text', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', align: 'center', width: '160' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
+  { text: '证书状态', value: 'certificateStatus', align: 'center' },
+  { text: '初次提交审核时间', value: 'submitTime', align: 'center', width: '180' },
+  { text: '完成时间', value: 'finishedTime', align: 'center', width: '180' },
+  { text: '退回次数', value: 'returns', align: 'center' },
+  { text: '制作人', value: 'createUser', align: 'center' },
 ])
 
 // 应出具证书数
@@ -45,6 +47,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -53,22 +68,28 @@
   }
   loading.value = true
   list.value = []
-  console.log('99999999', searchQuery.value, props.sampleId, props.customerId)
   searchQuery.value.customerId = props.customerId
   searchQuery.value.sampleId = props.sampleId
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: { certificationClass: string }) => {
+      return {
+        ...item,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-watch(() => props.sampleId, () => {
+watch(() => props.sampleId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
-watch(() => props.customerId, () => {
+watch(() => props.customerId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
@@ -83,8 +104,10 @@
   }
   fetchData(true)
 }
-onMounted(() => {
+onMounted(async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
+
     fetchData()
   }
 })
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 332a97c..a07df23 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -1,7 +1,10 @@
 <!-- 检定证书列表 -->
 <script lang="ts" setup name="CertificationRecords">
+import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateRecordsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -36,9 +39,9 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
-  { text: '证书类型', value: 'certificationType', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
   { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
+  // { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -46,6 +49,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -54,12 +70,18 @@
   }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : item.effectiveDate,
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : item.expirationDate,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-fetchData()
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -71,6 +93,11 @@
   }
   fetchData(true)
 }
+
+onMounted(async () => {
+  await getDict()
+  fetchData()
+})
 </script>
 
 <template>

diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 8223e4c..073c90f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -136,7 +136,7 @@
 export function getPdfStream(fileName: string) {
   return request({
     url: `/minio/file/download/stream?fileName=${fileName}`,
-    method: 'post',
+    method: 'get',
     responseType: 'blob',
   })
 }
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index e91f580..151ac41 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="CertificationMonitor">
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateMonitorsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -26,14 +28,14 @@
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
-  { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
-  { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
-  { text: '完成时间', value: 'text', align: 'center', width: '180' },
-  { text: '退回次数', value: 'text', align: 'center' },
-  { text: '制作人', value: 'text', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', align: 'center', width: '160' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
+  { text: '证书状态', value: 'certificateStatus', align: 'center' },
+  { text: '初次提交审核时间', value: 'submitTime', align: 'center', width: '180' },
+  { text: '完成时间', value: 'finishedTime', align: 'center', width: '180' },
+  { text: '退回次数', value: 'returns', align: 'center' },
+  { text: '制作人', value: 'createUser', align: 'center' },
 ])
 
 // 应出具证书数
@@ -45,6 +47,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -53,22 +68,28 @@
   }
   loading.value = true
   list.value = []
-  console.log('99999999', searchQuery.value, props.sampleId, props.customerId)
   searchQuery.value.customerId = props.customerId
   searchQuery.value.sampleId = props.sampleId
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: { certificationClass: string }) => {
+      return {
+        ...item,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-watch(() => props.sampleId, () => {
+watch(() => props.sampleId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
-watch(() => props.customerId, () => {
+watch(() => props.customerId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
@@ -83,8 +104,10 @@
   }
   fetchData(true)
 }
-onMounted(() => {
+onMounted(async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
+
     fetchData()
   }
 })
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 332a97c..a07df23 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -1,7 +1,10 @@
 <!-- 检定证书列表 -->
 <script lang="ts" setup name="CertificationRecords">
+import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateRecordsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -36,9 +39,9 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
-  { text: '证书类型', value: 'certificationType', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
   { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
+  // { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -46,6 +49,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -54,12 +70,18 @@
   }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : item.effectiveDate,
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : item.expirationDate,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-fetchData()
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -71,6 +93,11 @@
   }
   fetchData(true)
 }
+
+onMounted(async () => {
+  await getDict()
+  fetchData()
+})
 </script>
 
 <template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index 34cd405..85bbb77 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -1,8 +1,8 @@
 <!-- 检定记录 -->
 <script lang="ts" setup name="MeasureRecords">
+import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { measureRecordsById } from '@/api/business/schedule/task'
-
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -58,7 +58,13 @@
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : item.deliverTime,
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false

diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 8223e4c..073c90f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -136,7 +136,7 @@
 export function getPdfStream(fileName: string) {
   return request({
     url: `/minio/file/download/stream?fileName=${fileName}`,
-    method: 'post',
+    method: 'get',
     responseType: 'blob',
   })
 }
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index e91f580..151ac41 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="CertificationMonitor">
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateMonitorsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -26,14 +28,14 @@
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
-  { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
-  { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
-  { text: '完成时间', value: 'text', align: 'center', width: '180' },
-  { text: '退回次数', value: 'text', align: 'center' },
-  { text: '制作人', value: 'text', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', align: 'center', width: '160' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
+  { text: '证书状态', value: 'certificateStatus', align: 'center' },
+  { text: '初次提交审核时间', value: 'submitTime', align: 'center', width: '180' },
+  { text: '完成时间', value: 'finishedTime', align: 'center', width: '180' },
+  { text: '退回次数', value: 'returns', align: 'center' },
+  { text: '制作人', value: 'createUser', align: 'center' },
 ])
 
 // 应出具证书数
@@ -45,6 +47,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -53,22 +68,28 @@
   }
   loading.value = true
   list.value = []
-  console.log('99999999', searchQuery.value, props.sampleId, props.customerId)
   searchQuery.value.customerId = props.customerId
   searchQuery.value.sampleId = props.sampleId
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: { certificationClass: string }) => {
+      return {
+        ...item,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-watch(() => props.sampleId, () => {
+watch(() => props.sampleId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
-watch(() => props.customerId, () => {
+watch(() => props.customerId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
@@ -83,8 +104,10 @@
   }
   fetchData(true)
 }
-onMounted(() => {
+onMounted(async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
+
     fetchData()
   }
 })
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 332a97c..a07df23 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -1,7 +1,10 @@
 <!-- 检定证书列表 -->
 <script lang="ts" setup name="CertificationRecords">
+import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateRecordsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -36,9 +39,9 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
-  { text: '证书类型', value: 'certificationType', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
   { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
+  // { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -46,6 +49,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -54,12 +70,18 @@
   }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : item.effectiveDate,
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : item.expirationDate,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-fetchData()
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -71,6 +93,11 @@
   }
   fetchData(true)
 }
+
+onMounted(async () => {
+  await getDict()
+  fetchData()
+})
 </script>
 
 <template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index 34cd405..85bbb77 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -1,8 +1,8 @@
 <!-- 检定记录 -->
 <script lang="ts" setup name="MeasureRecords">
+import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { measureRecordsById } from '@/api/business/schedule/task'
-
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -58,7 +58,13 @@
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : item.deliverTime,
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index a9fb915..f8d9960 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -6,6 +6,9 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
+import { getStaffList } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+import { download } from '@/utils/download'
 
 import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
@@ -98,9 +101,20 @@
   // 校检类别
   const response = await getDictByCode('measureCategory')
   mesureCategoryList.value = response.data
+
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
   // 获取人员列表
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList(params).then((res) => {
+    userList.value = res.data.records
   })
 }
 getDict()
@@ -112,6 +126,27 @@
 const handleDetail = (row: any) => {
   detailRef.value.initDialog(row.printFileName)
 }
+
+// 点击下载
+const downloadFile = (row: any) => {
+  if (row.printFileName) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中，请稍后...',
+      background: 'rgba(255, 255, 255, 0.6)',
+    })
+    getPhotoUrl(row.printFileName).then((res) => {
+      download(res.data, `${row.certificateName}.xlsx` as string)
+      loading.close()
+    }).catch(() => {
+      ElMessage.error('下载失败')
+      loading.close()
+    })
+  }
+  else {
+    ElMessage('无可下载内容')
+  }
+}
 // 重检按钮
 const recheck = (row: any) => {
   ElMessageBox.confirm(
@@ -252,13 +287,21 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 size="small"
                 link
                 type="primary"
                 @click="handleDetail(row)"
               >
                 查看
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="downloadFile(row)"
+              >
+                下载
               </el-button>
 
               <el-button v-if="proxy.hasPerm('/schedule/certPrint/recheck')" size="small" :disabled="row.printStatusName === '作废'" link type="primary" @click="recheck(row)">

diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 8223e4c..073c90f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -136,7 +136,7 @@
 export function getPdfStream(fileName: string) {
   return request({
     url: `/minio/file/download/stream?fileName=${fileName}`,
-    method: 'post',
+    method: 'get',
     responseType: 'blob',
   })
 }
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index e91f580..151ac41 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="CertificationMonitor">
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateMonitorsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -26,14 +28,14 @@
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
-  { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
-  { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
-  { text: '完成时间', value: 'text', align: 'center', width: '180' },
-  { text: '退回次数', value: 'text', align: 'center' },
-  { text: '制作人', value: 'text', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', align: 'center', width: '160' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
+  { text: '证书状态', value: 'certificateStatus', align: 'center' },
+  { text: '初次提交审核时间', value: 'submitTime', align: 'center', width: '180' },
+  { text: '完成时间', value: 'finishedTime', align: 'center', width: '180' },
+  { text: '退回次数', value: 'returns', align: 'center' },
+  { text: '制作人', value: 'createUser', align: 'center' },
 ])
 
 // 应出具证书数
@@ -45,6 +47,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -53,22 +68,28 @@
   }
   loading.value = true
   list.value = []
-  console.log('99999999', searchQuery.value, props.sampleId, props.customerId)
   searchQuery.value.customerId = props.customerId
   searchQuery.value.sampleId = props.sampleId
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: { certificationClass: string }) => {
+      return {
+        ...item,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-watch(() => props.sampleId, () => {
+watch(() => props.sampleId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
-watch(() => props.customerId, () => {
+watch(() => props.customerId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
@@ -83,8 +104,10 @@
   }
   fetchData(true)
 }
-onMounted(() => {
+onMounted(async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
+
     fetchData()
   }
 })
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 332a97c..a07df23 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -1,7 +1,10 @@
 <!-- 检定证书列表 -->
 <script lang="ts" setup name="CertificationRecords">
+import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateRecordsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -36,9 +39,9 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
-  { text: '证书类型', value: 'certificationType', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
   { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
+  // { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -46,6 +49,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -54,12 +70,18 @@
   }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : item.effectiveDate,
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : item.expirationDate,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-fetchData()
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -71,6 +93,11 @@
   }
   fetchData(true)
 }
+
+onMounted(async () => {
+  await getDict()
+  fetchData()
+})
 </script>
 
 <template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index 34cd405..85bbb77 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -1,8 +1,8 @@
 <!-- 检定记录 -->
 <script lang="ts" setup name="MeasureRecords">
+import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { measureRecordsById } from '@/api/business/schedule/task'
-
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -58,7 +58,13 @@
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : item.deliverTime,
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index a9fb915..f8d9960 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -6,6 +6,9 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
+import { getStaffList } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+import { download } from '@/utils/download'
 
 import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
@@ -98,9 +101,20 @@
   // 校检类别
   const response = await getDictByCode('measureCategory')
   mesureCategoryList.value = response.data
+
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
   // 获取人员列表
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList(params).then((res) => {
+    userList.value = res.data.records
   })
 }
 getDict()
@@ -112,6 +126,27 @@
 const handleDetail = (row: any) => {
   detailRef.value.initDialog(row.printFileName)
 }
+
+// 点击下载
+const downloadFile = (row: any) => {
+  if (row.printFileName) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中，请稍后...',
+      background: 'rgba(255, 255, 255, 0.6)',
+    })
+    getPhotoUrl(row.printFileName).then((res) => {
+      download(res.data, `${row.certificateName}.xlsx` as string)
+      loading.close()
+    }).catch(() => {
+      ElMessage.error('下载失败')
+      loading.close()
+    })
+  }
+  else {
+    ElMessage('无可下载内容')
+  }
+}
 // 重检按钮
 const recheck = (row: any) => {
   ElMessageBox.confirm(
@@ -252,13 +287,21 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 size="small"
                 link
                 type="primary"
                 @click="handleDetail(row)"
               >
                 查看
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="downloadFile(row)"
+              >
+                下载
               </el-button>
 
               <el-button v-if="proxy.hasPerm('/schedule/certPrint/recheck')" size="small" :disabled="row.printStatusName === '作废'" link type="primary" @click="recheck(row)">
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index dc09c5e..12faf1b 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -9,6 +9,7 @@
   orderCode: string //	委托单编号
   sampleName: string //	样品名称
   sampleNo: string //	样品编号
+  certificateReportType?: string // 证书类别
   offset: number
   limit: number
 }
@@ -31,6 +32,7 @@
   decisionItem?: string
   approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
+  certificateReportCategory?: string // 证书类别
 }
 
 // 表单

diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 8223e4c..073c90f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -136,7 +136,7 @@
 export function getPdfStream(fileName: string) {
   return request({
     url: `/minio/file/download/stream?fileName=${fileName}`,
-    method: 'post',
+    method: 'get',
     responseType: 'blob',
   })
 }
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index e91f580..151ac41 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="CertificationMonitor">
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateMonitorsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -26,14 +28,14 @@
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
-  { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
-  { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
-  { text: '完成时间', value: 'text', align: 'center', width: '180' },
-  { text: '退回次数', value: 'text', align: 'center' },
-  { text: '制作人', value: 'text', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', align: 'center', width: '160' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
+  { text: '证书状态', value: 'certificateStatus', align: 'center' },
+  { text: '初次提交审核时间', value: 'submitTime', align: 'center', width: '180' },
+  { text: '完成时间', value: 'finishedTime', align: 'center', width: '180' },
+  { text: '退回次数', value: 'returns', align: 'center' },
+  { text: '制作人', value: 'createUser', align: 'center' },
 ])
 
 // 应出具证书数
@@ -45,6 +47,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -53,22 +68,28 @@
   }
   loading.value = true
   list.value = []
-  console.log('99999999', searchQuery.value, props.sampleId, props.customerId)
   searchQuery.value.customerId = props.customerId
   searchQuery.value.sampleId = props.sampleId
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: { certificationClass: string }) => {
+      return {
+        ...item,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-watch(() => props.sampleId, () => {
+watch(() => props.sampleId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
-watch(() => props.customerId, () => {
+watch(() => props.customerId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
@@ -83,8 +104,10 @@
   }
   fetchData(true)
 }
-onMounted(() => {
+onMounted(async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
+
     fetchData()
   }
 })
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 332a97c..a07df23 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -1,7 +1,10 @@
 <!-- 检定证书列表 -->
 <script lang="ts" setup name="CertificationRecords">
+import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateRecordsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -36,9 +39,9 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
-  { text: '证书类型', value: 'certificationType', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
   { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
+  // { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -46,6 +49,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -54,12 +70,18 @@
   }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : item.effectiveDate,
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : item.expirationDate,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-fetchData()
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -71,6 +93,11 @@
   }
   fetchData(true)
 }
+
+onMounted(async () => {
+  await getDict()
+  fetchData()
+})
 </script>
 
 <template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index 34cd405..85bbb77 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -1,8 +1,8 @@
 <!-- 检定记录 -->
 <script lang="ts" setup name="MeasureRecords">
+import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { measureRecordsById } from '@/api/business/schedule/task'
-
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -58,7 +58,13 @@
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : item.deliverTime,
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index a9fb915..f8d9960 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -6,6 +6,9 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
+import { getStaffList } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+import { download } from '@/utils/download'
 
 import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
@@ -98,9 +101,20 @@
   // 校检类别
   const response = await getDictByCode('measureCategory')
   mesureCategoryList.value = response.data
+
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
   // 获取人员列表
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList(params).then((res) => {
+    userList.value = res.data.records
   })
 }
 getDict()
@@ -112,6 +126,27 @@
 const handleDetail = (row: any) => {
   detailRef.value.initDialog(row.printFileName)
 }
+
+// 点击下载
+const downloadFile = (row: any) => {
+  if (row.printFileName) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中，请稍后...',
+      background: 'rgba(255, 255, 255, 0.6)',
+    })
+    getPhotoUrl(row.printFileName).then((res) => {
+      download(res.data, `${row.certificateName}.xlsx` as string)
+      loading.close()
+    }).catch(() => {
+      ElMessage.error('下载失败')
+      loading.close()
+    })
+  }
+  else {
+    ElMessage('无可下载内容')
+  }
+}
 // 重检按钮
 const recheck = (row: any) => {
   ElMessageBox.confirm(
@@ -252,13 +287,21 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 size="small"
                 link
                 type="primary"
                 @click="handleDetail(row)"
               >
                 查看
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="downloadFile(row)"
+              >
+                下载
               </el-button>
 
               <el-button v-if="proxy.hasPerm('/schedule/certPrint/recheck')" size="small" :disabled="row.printStatusName === '作废'" link type="primary" @click="recheck(row)">
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index dc09c5e..12faf1b 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -9,6 +9,7 @@
   orderCode: string //	委托单编号
   sampleName: string //	样品名称
   sampleNo: string //	样品编号
+  certificateReportType?: string // 证书类别
   offset: number
   limit: number
 }
@@ -31,6 +32,7 @@
   decisionItem?: string
   approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
+  certificateReportCategory?: string // 证书类别
 }
 
 // 表单
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index b6bdc41..1ffb678 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -300,7 +300,7 @@
   //   }
   // })
   if (type === 'order') {
-    sampleList.value = [{ ...val[0], id: val[0].sampleId }]
+    sampleList.value = [{ ...val[0], id: val[0].sampleId, remark: val[0].sampleRemark }]
   }
   else {
     sampleList.value = [{ ...val[0] }]

diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 8223e4c..073c90f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -136,7 +136,7 @@
 export function getPdfStream(fileName: string) {
   return request({
     url: `/minio/file/download/stream?fileName=${fileName}`,
-    method: 'post',
+    method: 'get',
     responseType: 'blob',
   })
 }
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index e91f580..151ac41 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="CertificationMonitor">
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateMonitorsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -26,14 +28,14 @@
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
-  { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
-  { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
-  { text: '完成时间', value: 'text', align: 'center', width: '180' },
-  { text: '退回次数', value: 'text', align: 'center' },
-  { text: '制作人', value: 'text', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', align: 'center', width: '160' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
+  { text: '证书状态', value: 'certificateStatus', align: 'center' },
+  { text: '初次提交审核时间', value: 'submitTime', align: 'center', width: '180' },
+  { text: '完成时间', value: 'finishedTime', align: 'center', width: '180' },
+  { text: '退回次数', value: 'returns', align: 'center' },
+  { text: '制作人', value: 'createUser', align: 'center' },
 ])
 
 // 应出具证书数
@@ -45,6 +47,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -53,22 +68,28 @@
   }
   loading.value = true
   list.value = []
-  console.log('99999999', searchQuery.value, props.sampleId, props.customerId)
   searchQuery.value.customerId = props.customerId
   searchQuery.value.sampleId = props.sampleId
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: { certificationClass: string }) => {
+      return {
+        ...item,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-watch(() => props.sampleId, () => {
+watch(() => props.sampleId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
-watch(() => props.customerId, () => {
+watch(() => props.customerId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
@@ -83,8 +104,10 @@
   }
   fetchData(true)
 }
-onMounted(() => {
+onMounted(async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
+
     fetchData()
   }
 })
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 332a97c..a07df23 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -1,7 +1,10 @@
 <!-- 检定证书列表 -->
 <script lang="ts" setup name="CertificationRecords">
+import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateRecordsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -36,9 +39,9 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
-  { text: '证书类型', value: 'certificationType', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
   { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
+  // { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -46,6 +49,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -54,12 +70,18 @@
   }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : item.effectiveDate,
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : item.expirationDate,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-fetchData()
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -71,6 +93,11 @@
   }
   fetchData(true)
 }
+
+onMounted(async () => {
+  await getDict()
+  fetchData()
+})
 </script>
 
 <template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index 34cd405..85bbb77 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -1,8 +1,8 @@
 <!-- 检定记录 -->
 <script lang="ts" setup name="MeasureRecords">
+import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { measureRecordsById } from '@/api/business/schedule/task'
-
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -58,7 +58,13 @@
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : item.deliverTime,
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index a9fb915..f8d9960 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -6,6 +6,9 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
+import { getStaffList } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+import { download } from '@/utils/download'
 
 import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
@@ -98,9 +101,20 @@
   // 校检类别
   const response = await getDictByCode('measureCategory')
   mesureCategoryList.value = response.data
+
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
   // 获取人员列表
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList(params).then((res) => {
+    userList.value = res.data.records
   })
 }
 getDict()
@@ -112,6 +126,27 @@
 const handleDetail = (row: any) => {
   detailRef.value.initDialog(row.printFileName)
 }
+
+// 点击下载
+const downloadFile = (row: any) => {
+  if (row.printFileName) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中，请稍后...',
+      background: 'rgba(255, 255, 255, 0.6)',
+    })
+    getPhotoUrl(row.printFileName).then((res) => {
+      download(res.data, `${row.certificateName}.xlsx` as string)
+      loading.close()
+    }).catch(() => {
+      ElMessage.error('下载失败')
+      loading.close()
+    })
+  }
+  else {
+    ElMessage('无可下载内容')
+  }
+}
 // 重检按钮
 const recheck = (row: any) => {
   ElMessageBox.confirm(
@@ -252,13 +287,21 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 size="small"
                 link
                 type="primary"
                 @click="handleDetail(row)"
               >
                 查看
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="downloadFile(row)"
+              >
+                下载
               </el-button>
 
               <el-button v-if="proxy.hasPerm('/schedule/certPrint/recheck')" size="small" :disabled="row.printStatusName === '作废'" link type="primary" @click="recheck(row)">
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index dc09c5e..12faf1b 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -9,6 +9,7 @@
   orderCode: string //	委托单编号
   sampleName: string //	样品名称
   sampleNo: string //	样品编号
+  certificateReportType?: string // 证书类别
   offset: number
   limit: number
 }
@@ -31,6 +32,7 @@
   decisionItem?: string
   approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
+  certificateReportCategory?: string // 证书类别
 }
 
 // 表单
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index b6bdc41..1ffb678 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -300,7 +300,7 @@
   //   }
   // })
   if (type === 'order') {
-    sampleList.value = [{ ...val[0], id: val[0].sampleId }]
+    sampleList.value = [{ ...val[0], id: val[0].sampleId, remark: val[0].sampleRemark }]
   }
   else {
     sampleList.value = [{ ...val[0] }]
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 1832c69..181fc10 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -22,6 +22,7 @@
 const $route = useRoute()
 const TabActiveButton = 'BusinessLabMeasureData'
 const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const certificateReportCategoryDict = ref({}) as any
 const active = ref('')
 // 查询条件
 const listQuery = ref<IListQuery>({
@@ -31,6 +32,7 @@
   customerName: '', //		委托方名称
   formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
   measureCategory: '', //	检校类别
+  certificateReportType: '', // 证书类别
   orderCode: '', //	委托单编号
   sampleName: '', //	样品名称
   sampleNo: '', //	样品编号
@@ -59,7 +61,7 @@
 const checkoutList = ref<string[]>([])
 const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
-const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
 const loadingTable = ref(false) // 表格loading
 
 // 表头
@@ -69,6 +71,7 @@
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center', width: '120' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定员', value: 'measurePerson', align: 'center' },
@@ -84,12 +87,13 @@
     listQuery.value.offset = 1
   }
   getMeasureDataList(listQuery.value).then((response: any) => {
-    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportTypeName: string; certificateReportCode: string }) => {
+    list.value = response.data.rows.map((item: { certificateReportCategory: string; calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportCategoryName: string; certificateReportCode: string }) => {
       return {
         ...item,
         calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
         followLinkArr: [item.orderCode], // 委托单编号
         fileArr: [item.certificateReportFile], // 证书附件
+        certificateReportCategoryName: item.certificateReportCategory ? certificateReportCategoryDict.value[item.certificateReportCategory] : item.certificateReportCategory, // 证书类别
       }
     })
     total.value = parseInt(response.data.total)
@@ -113,6 +117,7 @@
     customerName: '', //		委托方名称
     formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
     measureCategory: '', //	检校类别
+    certificateReportType: '', // 证书类别
     orderCode: '', //	委托单编号
     sampleName: '', //	样品名称
     sampleNo: '', //	样品编号
@@ -259,7 +264,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-
 // 获取字典值
 const getDict = async () => {
   // 审批状态
@@ -277,9 +281,12 @@
     }
   })
 
-  // 校检类别
-  const response = await getDictByCode('measureCategory')
-  mesureCategoryList.value = response.data
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
 }
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
@@ -343,14 +350,14 @@
           clearable
         />
       </search-item>
-      <search-item>
+      <search-item v-if="active === '0'">
         <el-select
-          v-model="listQuery.measureCategory"
-          placeholder="检校类别"
+          v-model="listQuery.certificateReportType"
+          placeholder="证书类别"
           clearable
         >
           <el-option
-            v-for="item in mesureCategoryList"
+            v-for="item in certificationTypeList"
             :key="item.value"
             :label="item.name"
             :value="item.value"

diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 8223e4c..073c90f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -136,7 +136,7 @@
 export function getPdfStream(fileName: string) {
   return request({
     url: `/minio/file/download/stream?fileName=${fileName}`,
-    method: 'post',
+    method: 'get',
     responseType: 'blob',
   })
 }
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index e91f580..151ac41 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="CertificationMonitor">
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateMonitorsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -26,14 +28,14 @@
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
-  { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
-  { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
-  { text: '完成时间', value: 'text', align: 'center', width: '180' },
-  { text: '退回次数', value: 'text', align: 'center' },
-  { text: '制作人', value: 'text', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', align: 'center', width: '160' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
+  { text: '证书状态', value: 'certificateStatus', align: 'center' },
+  { text: '初次提交审核时间', value: 'submitTime', align: 'center', width: '180' },
+  { text: '完成时间', value: 'finishedTime', align: 'center', width: '180' },
+  { text: '退回次数', value: 'returns', align: 'center' },
+  { text: '制作人', value: 'createUser', align: 'center' },
 ])
 
 // 应出具证书数
@@ -45,6 +47,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -53,22 +68,28 @@
   }
   loading.value = true
   list.value = []
-  console.log('99999999', searchQuery.value, props.sampleId, props.customerId)
   searchQuery.value.customerId = props.customerId
   searchQuery.value.sampleId = props.sampleId
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: { certificationClass: string }) => {
+      return {
+        ...item,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-watch(() => props.sampleId, () => {
+watch(() => props.sampleId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
-watch(() => props.customerId, () => {
+watch(() => props.customerId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
@@ -83,8 +104,10 @@
   }
   fetchData(true)
 }
-onMounted(() => {
+onMounted(async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
+
     fetchData()
   }
 })
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 332a97c..a07df23 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -1,7 +1,10 @@
 <!-- 检定证书列表 -->
 <script lang="ts" setup name="CertificationRecords">
+import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateRecordsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -36,9 +39,9 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
-  { text: '证书类型', value: 'certificationType', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
   { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
+  // { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -46,6 +49,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -54,12 +70,18 @@
   }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : item.effectiveDate,
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : item.expirationDate,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-fetchData()
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -71,6 +93,11 @@
   }
   fetchData(true)
 }
+
+onMounted(async () => {
+  await getDict()
+  fetchData()
+})
 </script>
 
 <template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index 34cd405..85bbb77 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -1,8 +1,8 @@
 <!-- 检定记录 -->
 <script lang="ts" setup name="MeasureRecords">
+import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { measureRecordsById } from '@/api/business/schedule/task'
-
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -58,7 +58,13 @@
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : item.deliverTime,
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index a9fb915..f8d9960 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -6,6 +6,9 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
+import { getStaffList } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+import { download } from '@/utils/download'
 
 import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
@@ -98,9 +101,20 @@
   // 校检类别
   const response = await getDictByCode('measureCategory')
   mesureCategoryList.value = response.data
+
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
   // 获取人员列表
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList(params).then((res) => {
+    userList.value = res.data.records
   })
 }
 getDict()
@@ -112,6 +126,27 @@
 const handleDetail = (row: any) => {
   detailRef.value.initDialog(row.printFileName)
 }
+
+// 点击下载
+const downloadFile = (row: any) => {
+  if (row.printFileName) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中，请稍后...',
+      background: 'rgba(255, 255, 255, 0.6)',
+    })
+    getPhotoUrl(row.printFileName).then((res) => {
+      download(res.data, `${row.certificateName}.xlsx` as string)
+      loading.close()
+    }).catch(() => {
+      ElMessage.error('下载失败')
+      loading.close()
+    })
+  }
+  else {
+    ElMessage('无可下载内容')
+  }
+}
 // 重检按钮
 const recheck = (row: any) => {
   ElMessageBox.confirm(
@@ -252,13 +287,21 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 size="small"
                 link
                 type="primary"
                 @click="handleDetail(row)"
               >
                 查看
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="downloadFile(row)"
+              >
+                下载
               </el-button>
 
               <el-button v-if="proxy.hasPerm('/schedule/certPrint/recheck')" size="small" :disabled="row.printStatusName === '作废'" link type="primary" @click="recheck(row)">
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index dc09c5e..12faf1b 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -9,6 +9,7 @@
   orderCode: string //	委托单编号
   sampleName: string //	样品名称
   sampleNo: string //	样品编号
+  certificateReportType?: string // 证书类别
   offset: number
   limit: number
 }
@@ -31,6 +32,7 @@
   decisionItem?: string
   approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
+  certificateReportCategory?: string // 证书类别
 }
 
 // 表单
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index b6bdc41..1ffb678 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -300,7 +300,7 @@
   //   }
   // })
   if (type === 'order') {
-    sampleList.value = [{ ...val[0], id: val[0].sampleId }]
+    sampleList.value = [{ ...val[0], id: val[0].sampleId, remark: val[0].sampleRemark }]
   }
   else {
     sampleList.value = [{ ...val[0] }]
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 1832c69..181fc10 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -22,6 +22,7 @@
 const $route = useRoute()
 const TabActiveButton = 'BusinessLabMeasureData'
 const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const certificateReportCategoryDict = ref({}) as any
 const active = ref('')
 // 查询条件
 const listQuery = ref<IListQuery>({
@@ -31,6 +32,7 @@
   customerName: '', //		委托方名称
   formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
   measureCategory: '', //	检校类别
+  certificateReportType: '', // 证书类别
   orderCode: '', //	委托单编号
   sampleName: '', //	样品名称
   sampleNo: '', //	样品编号
@@ -59,7 +61,7 @@
 const checkoutList = ref<string[]>([])
 const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
-const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
 const loadingTable = ref(false) // 表格loading
 
 // 表头
@@ -69,6 +71,7 @@
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center', width: '120' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定员', value: 'measurePerson', align: 'center' },
@@ -84,12 +87,13 @@
     listQuery.value.offset = 1
   }
   getMeasureDataList(listQuery.value).then((response: any) => {
-    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportTypeName: string; certificateReportCode: string }) => {
+    list.value = response.data.rows.map((item: { certificateReportCategory: string; calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportCategoryName: string; certificateReportCode: string }) => {
       return {
         ...item,
         calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
         followLinkArr: [item.orderCode], // 委托单编号
         fileArr: [item.certificateReportFile], // 证书附件
+        certificateReportCategoryName: item.certificateReportCategory ? certificateReportCategoryDict.value[item.certificateReportCategory] : item.certificateReportCategory, // 证书类别
       }
     })
     total.value = parseInt(response.data.total)
@@ -113,6 +117,7 @@
     customerName: '', //		委托方名称
     formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
     measureCategory: '', //	检校类别
+    certificateReportType: '', // 证书类别
     orderCode: '', //	委托单编号
     sampleName: '', //	样品名称
     sampleNo: '', //	样品编号
@@ -259,7 +264,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-
 // 获取字典值
 const getDict = async () => {
   // 审批状态
@@ -277,9 +281,12 @@
     }
   })
 
-  // 校检类别
-  const response = await getDictByCode('measureCategory')
-  mesureCategoryList.value = response.data
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
 }
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
@@ -343,14 +350,14 @@
           clearable
         />
       </search-item>
-      <search-item>
+      <search-item v-if="active === '0'">
         <el-select
-          v-model="listQuery.measureCategory"
-          placeholder="检校类别"
+          v-model="listQuery.certificateReportType"
+          placeholder="证书类别"
           clearable
         >
           <el-option
-            v-for="item in mesureCategoryList"
+            v-for="item in certificationTypeList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
index db1494b..b9b5626 100644
--- a/src/views/business/lab/myMeasure/measureDetail.vue
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -1,4 +1,3 @@
-<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'

diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 8223e4c..073c90f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -136,7 +136,7 @@
 export function getPdfStream(fileName: string) {
   return request({
     url: `/minio/file/download/stream?fileName=${fileName}`,
-    method: 'post',
+    method: 'get',
     responseType: 'blob',
   })
 }
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
index e91f580..151ac41 100644
--- a/src/components/Sample/certificationMonitor.vue
+++ b/src/components/Sample/certificationMonitor.vue
@@ -2,6 +2,8 @@
 <script lang="ts" setup name="CertificationMonitor">
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateMonitorsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -26,14 +28,14 @@
 })
 // 表格表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center', width: '160' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
-  { text: '证书类型', value: 'certificationReportCategoryName', align: 'center' },
-  { text: '证书状态', value: 'certificationState', align: 'center' },
-  { text: '初次提交审核时间', value: 'text', align: 'center', width: '180' },
-  { text: '完成时间', value: 'text', align: 'center', width: '180' },
-  { text: '退回次数', value: 'text', align: 'center' },
-  { text: '制作人', value: 'text', align: 'center' },
+  { text: '证书编号', value: 'certificateReportCode', align: 'center', width: '160' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
+  { text: '证书状态', value: 'certificateStatus', align: 'center' },
+  { text: '初次提交审核时间', value: 'submitTime', align: 'center', width: '180' },
+  { text: '完成时间', value: 'finishedTime', align: 'center', width: '180' },
+  { text: '退回次数', value: 'returns', align: 'center' },
+  { text: '制作人', value: 'createUser', align: 'center' },
 ])
 
 // 应出具证书数
@@ -45,6 +47,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -53,22 +68,28 @@
   }
   loading.value = true
   list.value = []
-  console.log('99999999', searchQuery.value, props.sampleId, props.customerId)
   searchQuery.value.customerId = props.customerId
   searchQuery.value.sampleId = props.sampleId
   certificateMonitorsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: { certificationClass: string }) => {
+      return {
+        ...item,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-watch(() => props.sampleId, () => {
+watch(() => props.sampleId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
-watch(() => props.customerId, () => {
+watch(() => props.customerId, async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
     fetchData()
   }
 })
@@ -83,8 +104,10 @@
   }
   fetchData(true)
 }
-onMounted(() => {
+onMounted(async () => {
   if (props.sampleId && props.customerId) {
+    await getDict()
+
     fetchData()
   }
 })
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index 332a97c..a07df23 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -1,7 +1,10 @@
 <!-- 检定证书列表 -->
 <script lang="ts" setup name="CertificationRecords">
+import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { certificateRecordsById } from '@/api/business/schedule/task'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -36,9 +39,9 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificationCode', align: 'center', width: '160' },
   { text: '证书名称', value: 'certificationName', align: 'center' },
-  { text: '证书类型', value: 'certificationType', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center' },
   { text: '证书出具日期', value: 'effectiveDate', align: 'center', width: '120' },
-  { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
+  // { text: '证书有效期', value: 'expirationDate', align: 'center', width: '120' },
 ])
 
 // 证书列表
@@ -46,6 +49,19 @@
 const total = ref(0)
 // 加载状态
 const loading = ref(false)
+
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
+const certificateReportCategoryDict = ref({}) as any
+
+// 获取字典值
+const getDict = async () => {
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
+}
 // 查找证书状态及列表
 function fetchData(isNowPage = false) {
   if (!isNowPage) {
@@ -54,12 +70,18 @@
   }
   loading.value = true
   certificateRecordsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        effectiveDate: item.effectiveDate ? dayjs(item.effectiveDate).format('YYYY-MM-DD') : item.effectiveDate,
+        expirationDate: item.expirationDate ? dayjs(item.expirationDate).format('YYYY-MM-DD') : item.expirationDate,
+        certificateReportCategoryName: `${item.certificationClass}` ? certificateReportCategoryDict.value[item.certificationClass] : item.certificationClass, // 证书类别
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
 }
-fetchData()
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -71,6 +93,11 @@
   }
   fetchData(true)
 }
+
+onMounted(async () => {
+  await getDict()
+  fetchData()
+})
 </script>
 
 <template>
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
index 34cd405..85bbb77 100644
--- a/src/components/Sample/measureRecords.vue
+++ b/src/components/Sample/measureRecords.vue
@@ -1,8 +1,8 @@
 <!-- 检定记录 -->
 <script lang="ts" setup name="MeasureRecords">
+import dayjs from 'dayjs'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { measureRecordsById } from '@/api/business/schedule/task'
-
 const props = defineProps({
   // 样品id
   sampleId: {
@@ -58,7 +58,13 @@
   loading.value = true
   list.value = []
   measureRecordsById({ ...searchQuery.value }).then((res) => {
-    list.value = res.data.rows
+    list.value = res.data.rows.map((item: any) => {
+      return {
+        ...item,
+        orderTime: item.orderTime ? dayjs(item.orderTime).format('YYYY-MM-DD') : item.orderTime,
+        deliverTime: item.deliverTime ? dayjs(item.deliverTime).format('YYYY-MM-DD') : item.deliverTime,
+      }
+    })
     total.value = parseInt(res.data.total)
   })
   loading.value = false
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index a9fb915..f8d9960 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -6,6 +6,9 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
+import { getStaffList } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
+import { download } from '@/utils/download'
 
 import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
@@ -98,9 +101,20 @@
   // 校检类别
   const response = await getDictByCode('measureCategory')
   mesureCategoryList.value = response.data
+
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
   // 获取人员列表
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
+  getStaffList(params).then((res) => {
+    userList.value = res.data.records
   })
 }
 getDict()
@@ -112,6 +126,27 @@
 const handleDetail = (row: any) => {
   detailRef.value.initDialog(row.printFileName)
 }
+
+// 点击下载
+const downloadFile = (row: any) => {
+  if (row.printFileName) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中，请稍后...',
+      background: 'rgba(255, 255, 255, 0.6)',
+    })
+    getPhotoUrl(row.printFileName).then((res) => {
+      download(res.data, `${row.certificateName}.xlsx` as string)
+      loading.close()
+    }).catch(() => {
+      ElMessage.error('下载失败')
+      loading.close()
+    })
+  }
+  else {
+    ElMessage('无可下载内容')
+  }
+}
 // 重检按钮
 const recheck = (row: any) => {
   ElMessageBox.confirm(
@@ -252,13 +287,21 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="130" fixed="right">
             <template #default="{ row }">
-              <el-button
+              <!-- <el-button
                 size="small"
                 link
                 type="primary"
                 @click="handleDetail(row)"
               >
                 查看
+              </el-button> -->
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="downloadFile(row)"
+              >
+                下载
               </el-button>
 
               <el-button v-if="proxy.hasPerm('/schedule/certPrint/recheck')" size="small" :disabled="row.printStatusName === '作废'" link type="primary" @click="recheck(row)">
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index dc09c5e..12faf1b 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -9,6 +9,7 @@
   orderCode: string //	委托单编号
   sampleName: string //	样品名称
   sampleNo: string //	样品编号
+  certificateReportType?: string // 证书类别
   offset: number
   limit: number
 }
@@ -31,6 +32,7 @@
   decisionItem?: string
   approvalStatusName?: string // 审批状态名称
   processId?: string // 流程实例id
+  certificateReportCategory?: string // 证书类别
 }
 
 // 表单
diff --git a/src/views/business/lab/measureData/measureDataDetail.vue b/src/views/business/lab/measureData/measureDataDetail.vue
index b6bdc41..1ffb678 100644
--- a/src/views/business/lab/measureData/measureDataDetail.vue
+++ b/src/views/business/lab/measureData/measureDataDetail.vue
@@ -300,7 +300,7 @@
   //   }
   // })
   if (type === 'order') {
-    sampleList.value = [{ ...val[0], id: val[0].sampleId }]
+    sampleList.value = [{ ...val[0], id: val[0].sampleId, remark: val[0].sampleRemark }]
   }
   else {
     sampleList.value = [{ ...val[0] }]
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 1832c69..181fc10 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -22,6 +22,7 @@
 const $route = useRoute()
 const TabActiveButton = 'BusinessLabMeasureData'
 const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const certificateReportCategoryDict = ref({}) as any
 const active = ref('')
 // 查询条件
 const listQuery = ref<IListQuery>({
@@ -31,6 +32,7 @@
   customerName: '', //		委托方名称
   formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
   measureCategory: '', //	检校类别
+  certificateReportType: '', // 证书类别
   orderCode: '', //	委托单编号
   sampleName: '', //	样品名称
   sampleNo: '', //	样品编号
@@ -59,7 +61,7 @@
 const checkoutList = ref<string[]>([])
 const list = ref<IList[]>([]) // 数据列表
 const total = ref(0) // 总条数
-const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const certificationTypeList = ref<dictType[]>([]) // 证书类别
 const loadingTable = ref(false) // 表格loading
 
 // 表头
@@ -69,6 +71,7 @@
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '证书类别', value: 'certificateReportCategoryName', align: 'center', width: '120' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定员', value: 'measurePerson', align: 'center' },
@@ -84,12 +87,13 @@
     listQuery.value.offset = 1
   }
   getMeasureDataList(listQuery.value).then((response: any) => {
-    list.value = response.data.rows.map((item: { calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportTypeName: string; certificateReportCode: string }) => {
+    list.value = response.data.rows.map((item: { certificateReportCategory: string; calibrationTime: string; orderCode: string; certificateReportFile: string; certificateReportName: string; calibrationMajorName: string; certificateReportCategoryName: string; certificateReportCode: string }) => {
       return {
         ...item,
         calibrationTime: item.calibrationTime ? dayjs(item.calibrationTime).format('YYYY-MM-DD') : item.calibrationTime,
         followLinkArr: [item.orderCode], // 委托单编号
         fileArr: [item.certificateReportFile], // 证书附件
+        certificateReportCategoryName: item.certificateReportCategory ? certificateReportCategoryDict.value[item.certificateReportCategory] : item.certificateReportCategory, // 证书类别
       }
     })
     total.value = parseInt(response.data.total)
@@ -113,6 +117,7 @@
     customerName: '', //		委托方名称
     formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
     measureCategory: '', //	检校类别
+    certificateReportType: '', // 证书类别
     orderCode: '', //	委托单编号
     sampleName: '', //	样品名称
     sampleNo: '', //	样品编号
@@ -259,7 +264,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-
 // 获取字典值
 const getDict = async () => {
   // 审批状态
@@ -277,9 +281,12 @@
     }
   })
 
-  // 校检类别
-  const response = await getDictByCode('measureCategory')
-  mesureCategoryList.value = response.data
+  // 证书类别
+  const response = await getDictByCode('certificationType')
+  certificationTypeList.value = response.data
+  response.data.forEach((item: any) => {
+    certificateReportCategoryDict.value[`${item.value}`] = item.name
+  })
 }
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
@@ -343,14 +350,14 @@
           clearable
         />
       </search-item>
-      <search-item>
+      <search-item v-if="active === '0'">
         <el-select
-          v-model="listQuery.measureCategory"
-          placeholder="检校类别"
+          v-model="listQuery.certificateReportType"
+          placeholder="证书类别"
           clearable
         >
           <el-option
-            v-for="item in mesureCategoryList"
+            v-for="item in certificationTypeList"
             :key="item.value"
             :label="item.name"
             :value="item.value"
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
index db1494b..b9b5626 100644
--- a/src/views/business/lab/myMeasure/measureDetail.vue
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -1,4 +1,3 @@
-<!-- 任务分发 -->
 <script lang="ts" setup name="TaskEdit">
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index dec7348..cdf5df2 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -118,9 +118,6 @@
   if (!listQuery.value.measureStatus) {
     listQuery.value.measureStatus = '2' // 待检测
   }
-  if (listQuery.value.measureStatus !== '3') {
-    listQuery.value.remark = ''
-  }
   getMyMeasureList(listQuery.value).then((res) => {
     list.value = res.data.rows.map((item: ITaskList) => {
       item.isUrgentName = item.isUrgent == 1 ? '是' : '否'