diff --git a/src/api/business/lab/certificateReportRetrieval.ts b/src/api/business/lab/certificateReportRetrieval.ts
index dbb24c7..2d0236d 100644
--- a/src/api/business/lab/certificateReportRetrieval.ts
+++ b/src/api/business/lab/certificateReportRetrieval.ts
@@ -10,3 +10,12 @@
     data,
   })
 }
+
+// 证书更换
+export function changeCert(data: { certificatePrintId: string; minioFileName: string }) {
+  return request({
+    url: '/business/certificatePrint/change',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/business/lab/certificateReportRetrieval.ts b/src/api/business/lab/certificateReportRetrieval.ts
index dbb24c7..2d0236d 100644
--- a/src/api/business/lab/certificateReportRetrieval.ts
+++ b/src/api/business/lab/certificateReportRetrieval.ts
@@ -10,3 +10,12 @@
     data,
   })
 }
+
+// 证书更换
+export function changeCert(data: { certificatePrintId: string; minioFileName: string }) {
+  return request({
+    url: '/business/certificatePrint/change',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index f8d9960..9581187 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -5,10 +5,11 @@
 import DetailDialog from './detailDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
-import { getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
+import { changeCert, getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
 import { getStaffList } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { download } from '@/utils/download'
+import { UploadFile } from '@/api/measure/file'
 
 import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
@@ -23,6 +24,7 @@
   certificateName: '', // 证书名称
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
   manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托方编号
   customerName: '', // 委托方名称
@@ -38,8 +40,9 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateNo', align: 'center' },
   { text: '证书名称', value: 'certificateName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', align: 'center' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方编号', value: 'orderNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
@@ -75,6 +78,7 @@
     certificateName: '', // 证书名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    sampleModel: '', // 型号
     manufacturingNo: '', // 出厂编号
     orderNo: '', // 委托方编号
     customerName: '', // 委托方名称
@@ -170,6 +174,59 @@
     })
   })
 }
+
+// -----------------------------------------更换证书-------------------------------------------
+const fileRef = ref() // 文件上传input
+const changeCertificateReportId = ref('')
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    const loading = ElLoading.service({
+      lock: true,
+      text: '加载中...',
+      background: 'rgba(255, 255, 255, 0.6)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        // ElMessage.success('文件上传成功')
+        event.target.value = ''
+        const params = {
+          minioFileName: res.data[0],
+          certificatePrintId: changeCertificateReportId.value,
+        }
+        changeCert(params).then(() => {
+          ElMessage.success('更换证书成功')
+          loading.close()
+        }).catch(() => {
+          ElMessage.warning('文件上传失败')
+          loading.close()
+        })
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    }).catch(() => {
+      ElMessage.warning('文件上传失败')
+      loading.close()
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 点击更换证书
+const clickChangeCert = (row: any) => {
+  changeCertificateReportId.value = row.id
+  upload()
+}
+// -------------------------------------------------------------------------------------------------
 </script>
 
 <template>
@@ -193,15 +250,15 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
-          placeholder="样品编号"
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleName"
-          placeholder="样品名称"
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
           clearable
         />
       </search-item>
@@ -285,7 +342,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="130" fixed="right">
+          <el-table-column label="操作" align="center" width="180" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                 size="small"
@@ -304,6 +361,16 @@
                 下载
               </el-button>
 
+              <el-button
+                v-if="proxy.hasPerm('/schedule/certPrint/changeCert')"
+                size="small"
+                link
+                type="primary"
+                @click="clickChangeCert(row)"
+              >
+                更换证书
+              </el-button>
+
               <el-button v-if="proxy.hasPerm('/schedule/certPrint/recheck')" size="small" :disabled="row.printStatusName === '作废'" link type="primary" @click="recheck(row)">
                 重检
               </el-button>
@@ -312,5 +379,6 @@
         </template>
       </normal-table>
     </table-container>
+    <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
   </app-container>
 </template>

diff --git a/src/api/business/lab/certificateReportRetrieval.ts b/src/api/business/lab/certificateReportRetrieval.ts
index dbb24c7..2d0236d 100644
--- a/src/api/business/lab/certificateReportRetrieval.ts
+++ b/src/api/business/lab/certificateReportRetrieval.ts
@@ -10,3 +10,12 @@
     data,
   })
 }
+
+// 证书更换
+export function changeCert(data: { certificatePrintId: string; minioFileName: string }) {
+  return request({
+    url: '/business/certificatePrint/change',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index f8d9960..9581187 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -5,10 +5,11 @@
 import DetailDialog from './detailDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
-import { getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
+import { changeCert, getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
 import { getStaffList } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { download } from '@/utils/download'
+import { UploadFile } from '@/api/measure/file'
 
 import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
@@ -23,6 +24,7 @@
   certificateName: '', // 证书名称
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
   manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托方编号
   customerName: '', // 委托方名称
@@ -38,8 +40,9 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateNo', align: 'center' },
   { text: '证书名称', value: 'certificateName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', align: 'center' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方编号', value: 'orderNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
@@ -75,6 +78,7 @@
     certificateName: '', // 证书名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    sampleModel: '', // 型号
     manufacturingNo: '', // 出厂编号
     orderNo: '', // 委托方编号
     customerName: '', // 委托方名称
@@ -170,6 +174,59 @@
     })
   })
 }
+
+// -----------------------------------------更换证书-------------------------------------------
+const fileRef = ref() // 文件上传input
+const changeCertificateReportId = ref('')
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    const loading = ElLoading.service({
+      lock: true,
+      text: '加载中...',
+      background: 'rgba(255, 255, 255, 0.6)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        // ElMessage.success('文件上传成功')
+        event.target.value = ''
+        const params = {
+          minioFileName: res.data[0],
+          certificatePrintId: changeCertificateReportId.value,
+        }
+        changeCert(params).then(() => {
+          ElMessage.success('更换证书成功')
+          loading.close()
+        }).catch(() => {
+          ElMessage.warning('文件上传失败')
+          loading.close()
+        })
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    }).catch(() => {
+      ElMessage.warning('文件上传失败')
+      loading.close()
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 点击更换证书
+const clickChangeCert = (row: any) => {
+  changeCertificateReportId.value = row.id
+  upload()
+}
+// -------------------------------------------------------------------------------------------------
 </script>
 
 <template>
@@ -193,15 +250,15 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
-          placeholder="样品编号"
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleName"
-          placeholder="样品名称"
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
           clearable
         />
       </search-item>
@@ -285,7 +342,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="130" fixed="right">
+          <el-table-column label="操作" align="center" width="180" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                 size="small"
@@ -304,6 +361,16 @@
                 下载
               </el-button>
 
+              <el-button
+                v-if="proxy.hasPerm('/schedule/certPrint/changeCert')"
+                size="small"
+                link
+                type="primary"
+                @click="clickChangeCert(row)"
+              >
+                更换证书
+              </el-button>
+
               <el-button v-if="proxy.hasPerm('/schedule/certPrint/recheck')" size="small" :disabled="row.printStatusName === '作废'" link type="primary" @click="recheck(row)">
                 重检
               </el-button>
@@ -312,5 +379,6 @@
         </template>
       </normal-table>
     </table-container>
+    <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 051be9a..78fbd04 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,5 +1,8 @@
 // 查询条件
 export interface IListQuery {
+  sampleModel: string
+  manufacturingNo: string
+  measurePersonId: string
   approvalStatus: string //	审批状态类型code
   certificateReportCode: string //		证书编号
   certificateReportName: string //		证书名称

diff --git a/src/api/business/lab/certificateReportRetrieval.ts b/src/api/business/lab/certificateReportRetrieval.ts
index dbb24c7..2d0236d 100644
--- a/src/api/business/lab/certificateReportRetrieval.ts
+++ b/src/api/business/lab/certificateReportRetrieval.ts
@@ -10,3 +10,12 @@
     data,
   })
 }
+
+// 证书更换
+export function changeCert(data: { certificatePrintId: string; minioFileName: string }) {
+  return request({
+    url: '/business/certificatePrint/change',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index f8d9960..9581187 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -5,10 +5,11 @@
 import DetailDialog from './detailDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
-import { getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
+import { changeCert, getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
 import { getStaffList } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { download } from '@/utils/download'
+import { UploadFile } from '@/api/measure/file'
 
 import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
@@ -23,6 +24,7 @@
   certificateName: '', // 证书名称
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
   manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托方编号
   customerName: '', // 委托方名称
@@ -38,8 +40,9 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateNo', align: 'center' },
   { text: '证书名称', value: 'certificateName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', align: 'center' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方编号', value: 'orderNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
@@ -75,6 +78,7 @@
     certificateName: '', // 证书名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    sampleModel: '', // 型号
     manufacturingNo: '', // 出厂编号
     orderNo: '', // 委托方编号
     customerName: '', // 委托方名称
@@ -170,6 +174,59 @@
     })
   })
 }
+
+// -----------------------------------------更换证书-------------------------------------------
+const fileRef = ref() // 文件上传input
+const changeCertificateReportId = ref('')
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    const loading = ElLoading.service({
+      lock: true,
+      text: '加载中...',
+      background: 'rgba(255, 255, 255, 0.6)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        // ElMessage.success('文件上传成功')
+        event.target.value = ''
+        const params = {
+          minioFileName: res.data[0],
+          certificatePrintId: changeCertificateReportId.value,
+        }
+        changeCert(params).then(() => {
+          ElMessage.success('更换证书成功')
+          loading.close()
+        }).catch(() => {
+          ElMessage.warning('文件上传失败')
+          loading.close()
+        })
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    }).catch(() => {
+      ElMessage.warning('文件上传失败')
+      loading.close()
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 点击更换证书
+const clickChangeCert = (row: any) => {
+  changeCertificateReportId.value = row.id
+  upload()
+}
+// -------------------------------------------------------------------------------------------------
 </script>
 
 <template>
@@ -193,15 +250,15 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
-          placeholder="样品编号"
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleName"
-          placeholder="样品名称"
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
           clearable
         />
       </search-item>
@@ -285,7 +342,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="130" fixed="right">
+          <el-table-column label="操作" align="center" width="180" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                 size="small"
@@ -304,6 +361,16 @@
                 下载
               </el-button>
 
+              <el-button
+                v-if="proxy.hasPerm('/schedule/certPrint/changeCert')"
+                size="small"
+                link
+                type="primary"
+                @click="clickChangeCert(row)"
+              >
+                更换证书
+              </el-button>
+
               <el-button v-if="proxy.hasPerm('/schedule/certPrint/recheck')" size="small" :disabled="row.printStatusName === '作废'" link type="primary" @click="recheck(row)">
                 重检
               </el-button>
@@ -312,5 +379,6 @@
         </template>
       </normal-table>
     </table-container>
+    <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 051be9a..78fbd04 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,5 +1,8 @@
 // 查询条件
 export interface IListQuery {
+  sampleModel: string
+  manufacturingNo: string
+  measurePersonId: string
   approvalStatus: string //	审批状态类型code
   certificateReportCode: string //		证书编号
   certificateReportName: string //		证书名称
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 80bc664..fc97efb 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -14,6 +14,7 @@
 // import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { getStaffList } from '@/api/measure/person'
 import { cancelApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
@@ -29,6 +30,9 @@
 const active = ref('')
 // 查询条件
 const listQuery = ref<IListQuery>({
+  sampleModel: '',
+  manufacturingNo: '',
+  measurePersonId: '',
   approvalStatus: active.value, // 审批状态
   certificateReportCode: '', //		证书编号
   certificateReportName: '', //		证书名称
@@ -71,9 +75,10 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
   { text: '证书名称', value: 'certificateReportName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  // { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '证书类别', value: 'certificateReportCategoryName', align: 'center', width: '120' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
@@ -114,6 +119,9 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
+    sampleModel: '',
+    manufacturingNo: '',
+    measurePersonId: '',
     approvalStatus: active.value, // 审批状态
     certificateReportCode: '', //		证书编号
     certificateReportName: '', //		证书名称
@@ -293,6 +301,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
+const userList: any = ref([]) // 计量人员列表
 // 获取字典值
 const getDict = async () => {
   // 审批状态
@@ -316,7 +325,24 @@
   response.data.forEach((item: any) => {
     certificateReportCategoryDict.value[`${item.value}`] = item.name
   })
+
+  // 获取计量人员列表
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  // 获取人员列表
+  getStaffList(params).then((res) => {
+    userList.value = res.data.records
+  })
 }
+
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
   active.value = val
@@ -379,6 +405,30 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measurePersonId" filterable clearable placeholder="检定员"
+        >
+          <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+            <span style="float: left;">{{ item.name }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+          </el-option>
+        </el-select>
+      </search-item>
       <search-item v-if="active === '0'">
         <el-select
           v-model="listQuery.certificateReportType"

diff --git a/src/api/business/lab/certificateReportRetrieval.ts b/src/api/business/lab/certificateReportRetrieval.ts
index dbb24c7..2d0236d 100644
--- a/src/api/business/lab/certificateReportRetrieval.ts
+++ b/src/api/business/lab/certificateReportRetrieval.ts
@@ -10,3 +10,12 @@
     data,
   })
 }
+
+// 证书更换
+export function changeCert(data: { certificatePrintId: string; minioFileName: string }) {
+  return request({
+    url: '/business/certificatePrint/change',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index f8d9960..9581187 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -5,10 +5,11 @@
 import DetailDialog from './detailDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
-import { getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
+import { changeCert, getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
 import { getStaffList } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { download } from '@/utils/download'
+import { UploadFile } from '@/api/measure/file'
 
 import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
@@ -23,6 +24,7 @@
   certificateName: '', // 证书名称
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
   manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托方编号
   customerName: '', // 委托方名称
@@ -38,8 +40,9 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateNo', align: 'center' },
   { text: '证书名称', value: 'certificateName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', align: 'center' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方编号', value: 'orderNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
@@ -75,6 +78,7 @@
     certificateName: '', // 证书名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    sampleModel: '', // 型号
     manufacturingNo: '', // 出厂编号
     orderNo: '', // 委托方编号
     customerName: '', // 委托方名称
@@ -170,6 +174,59 @@
     })
   })
 }
+
+// -----------------------------------------更换证书-------------------------------------------
+const fileRef = ref() // 文件上传input
+const changeCertificateReportId = ref('')
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    const loading = ElLoading.service({
+      lock: true,
+      text: '加载中...',
+      background: 'rgba(255, 255, 255, 0.6)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        // ElMessage.success('文件上传成功')
+        event.target.value = ''
+        const params = {
+          minioFileName: res.data[0],
+          certificatePrintId: changeCertificateReportId.value,
+        }
+        changeCert(params).then(() => {
+          ElMessage.success('更换证书成功')
+          loading.close()
+        }).catch(() => {
+          ElMessage.warning('文件上传失败')
+          loading.close()
+        })
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    }).catch(() => {
+      ElMessage.warning('文件上传失败')
+      loading.close()
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 点击更换证书
+const clickChangeCert = (row: any) => {
+  changeCertificateReportId.value = row.id
+  upload()
+}
+// -------------------------------------------------------------------------------------------------
 </script>
 
 <template>
@@ -193,15 +250,15 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
-          placeholder="样品编号"
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleName"
-          placeholder="样品名称"
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
           clearable
         />
       </search-item>
@@ -285,7 +342,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="130" fixed="right">
+          <el-table-column label="操作" align="center" width="180" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                 size="small"
@@ -304,6 +361,16 @@
                 下载
               </el-button>
 
+              <el-button
+                v-if="proxy.hasPerm('/schedule/certPrint/changeCert')"
+                size="small"
+                link
+                type="primary"
+                @click="clickChangeCert(row)"
+              >
+                更换证书
+              </el-button>
+
               <el-button v-if="proxy.hasPerm('/schedule/certPrint/recheck')" size="small" :disabled="row.printStatusName === '作废'" link type="primary" @click="recheck(row)">
                 重检
               </el-button>
@@ -312,5 +379,6 @@
         </template>
       </normal-table>
     </table-container>
+    <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 051be9a..78fbd04 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,5 +1,8 @@
 // 查询条件
 export interface IListQuery {
+  sampleModel: string
+  manufacturingNo: string
+  measurePersonId: string
   approvalStatus: string //	审批状态类型code
   certificateReportCode: string //		证书编号
   certificateReportName: string //		证书名称
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 80bc664..fc97efb 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -14,6 +14,7 @@
 // import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { getStaffList } from '@/api/measure/person'
 import { cancelApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
@@ -29,6 +30,9 @@
 const active = ref('')
 // 查询条件
 const listQuery = ref<IListQuery>({
+  sampleModel: '',
+  manufacturingNo: '',
+  measurePersonId: '',
   approvalStatus: active.value, // 审批状态
   certificateReportCode: '', //		证书编号
   certificateReportName: '', //		证书名称
@@ -71,9 +75,10 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
   { text: '证书名称', value: 'certificateReportName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  // { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '证书类别', value: 'certificateReportCategoryName', align: 'center', width: '120' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
@@ -114,6 +119,9 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
+    sampleModel: '',
+    manufacturingNo: '',
+    measurePersonId: '',
     approvalStatus: active.value, // 审批状态
     certificateReportCode: '', //		证书编号
     certificateReportName: '', //		证书名称
@@ -293,6 +301,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
+const userList: any = ref([]) // 计量人员列表
 // 获取字典值
 const getDict = async () => {
   // 审批状态
@@ -316,7 +325,24 @@
   response.data.forEach((item: any) => {
     certificateReportCategoryDict.value[`${item.value}`] = item.name
   })
+
+  // 获取计量人员列表
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  // 获取人员列表
+  getStaffList(params).then((res) => {
+    userList.value = res.data.records
+  })
 }
+
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
   active.value = val
@@ -379,6 +405,30 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measurePersonId" filterable clearable placeholder="检定员"
+        >
+          <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+            <span style="float: left;">{{ item.name }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+          </el-option>
+        </el-select>
+      </search-item>
       <search-item v-if="active === '0'">
         <el-select
           v-model="listQuery.certificateReportType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index c23f6ce..99d40fc 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -41,6 +41,8 @@
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托单编号
   customerNo: '', // 委托方代码
   startTime: '', // 预计送达开始时间
@@ -59,6 +61,8 @@
 listQuery.value = renewSearchParams('schedule-interchange') || {
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托单编号
   customerNo: '', // 委托方代码
   startTime: '', // 预计送达开始时间
@@ -72,7 +76,7 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头待收入
 const columnsTaking = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
@@ -85,7 +89,7 @@
   { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
@@ -200,6 +204,8 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    manufacturingNo: '', // 出厂编号
     orderNo: '', // 委托单编号
     customerNo: '', // 委托方代码
     startTime: '', // 预计送达开始时间
@@ -257,6 +263,8 @@
   if (list.value.length > 0) {
     const params = {
       sampleNo: listQuery.value.sampleNo, // 样品编号
+      sampleModel: listQuery.value.sampleModel, // 型号
+      manufacturingNo: listQuery.value.manufacturingNo, // 出厂编号
       sampleName: listQuery.value.sampleName, // 样品名称
       orderNo: listQuery.value.orderNo, // 委托单编号
       customerNo: listQuery.value.customerNo, // 委托方代码
@@ -548,14 +556,14 @@
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           class="short-input"
           clearable
         />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input
           v-model.trim="listQuery.sampleName"
@@ -566,6 +574,22 @@
       </search-item>
       <search-item>
         <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
           v-model.trim="listQuery.orderNo"
           placeholder="委托单编号"
           class="short-input"
@@ -740,7 +764,7 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
     <!-- 终止弹窗 -->
     <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
     <scan-sample-dialog ref="scanSampleRef" :title="dialogTitle" @confirm="scanOver" />

diff --git a/src/api/business/lab/certificateReportRetrieval.ts b/src/api/business/lab/certificateReportRetrieval.ts
index dbb24c7..2d0236d 100644
--- a/src/api/business/lab/certificateReportRetrieval.ts
+++ b/src/api/business/lab/certificateReportRetrieval.ts
@@ -10,3 +10,12 @@
     data,
   })
 }
+
+// 证书更换
+export function changeCert(data: { certificatePrintId: string; minioFileName: string }) {
+  return request({
+    url: '/business/certificatePrint/change',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index f8d9960..9581187 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -5,10 +5,11 @@
 import DetailDialog from './detailDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
-import { getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
+import { changeCert, getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
 import { getStaffList } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { download } from '@/utils/download'
+import { UploadFile } from '@/api/measure/file'
 
 import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
@@ -23,6 +24,7 @@
   certificateName: '', // 证书名称
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
   manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托方编号
   customerName: '', // 委托方名称
@@ -38,8 +40,9 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateNo', align: 'center' },
   { text: '证书名称', value: 'certificateName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', align: 'center' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方编号', value: 'orderNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
@@ -75,6 +78,7 @@
     certificateName: '', // 证书名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    sampleModel: '', // 型号
     manufacturingNo: '', // 出厂编号
     orderNo: '', // 委托方编号
     customerName: '', // 委托方名称
@@ -170,6 +174,59 @@
     })
   })
 }
+
+// -----------------------------------------更换证书-------------------------------------------
+const fileRef = ref() // 文件上传input
+const changeCertificateReportId = ref('')
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    const loading = ElLoading.service({
+      lock: true,
+      text: '加载中...',
+      background: 'rgba(255, 255, 255, 0.6)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        // ElMessage.success('文件上传成功')
+        event.target.value = ''
+        const params = {
+          minioFileName: res.data[0],
+          certificatePrintId: changeCertificateReportId.value,
+        }
+        changeCert(params).then(() => {
+          ElMessage.success('更换证书成功')
+          loading.close()
+        }).catch(() => {
+          ElMessage.warning('文件上传失败')
+          loading.close()
+        })
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    }).catch(() => {
+      ElMessage.warning('文件上传失败')
+      loading.close()
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 点击更换证书
+const clickChangeCert = (row: any) => {
+  changeCertificateReportId.value = row.id
+  upload()
+}
+// -------------------------------------------------------------------------------------------------
 </script>
 
 <template>
@@ -193,15 +250,15 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
-          placeholder="样品编号"
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleName"
-          placeholder="样品名称"
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
           clearable
         />
       </search-item>
@@ -285,7 +342,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="130" fixed="right">
+          <el-table-column label="操作" align="center" width="180" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                 size="small"
@@ -304,6 +361,16 @@
                 下载
               </el-button>
 
+              <el-button
+                v-if="proxy.hasPerm('/schedule/certPrint/changeCert')"
+                size="small"
+                link
+                type="primary"
+                @click="clickChangeCert(row)"
+              >
+                更换证书
+              </el-button>
+
               <el-button v-if="proxy.hasPerm('/schedule/certPrint/recheck')" size="small" :disabled="row.printStatusName === '作废'" link type="primary" @click="recheck(row)">
                 重检
               </el-button>
@@ -312,5 +379,6 @@
         </template>
       </normal-table>
     </table-container>
+    <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 051be9a..78fbd04 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,5 +1,8 @@
 // 查询条件
 export interface IListQuery {
+  sampleModel: string
+  manufacturingNo: string
+  measurePersonId: string
   approvalStatus: string //	审批状态类型code
   certificateReportCode: string //		证书编号
   certificateReportName: string //		证书名称
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 80bc664..fc97efb 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -14,6 +14,7 @@
 // import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { getStaffList } from '@/api/measure/person'
 import { cancelApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
@@ -29,6 +30,9 @@
 const active = ref('')
 // 查询条件
 const listQuery = ref<IListQuery>({
+  sampleModel: '',
+  manufacturingNo: '',
+  measurePersonId: '',
   approvalStatus: active.value, // 审批状态
   certificateReportCode: '', //		证书编号
   certificateReportName: '', //		证书名称
@@ -71,9 +75,10 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
   { text: '证书名称', value: 'certificateReportName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  // { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '证书类别', value: 'certificateReportCategoryName', align: 'center', width: '120' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
@@ -114,6 +119,9 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
+    sampleModel: '',
+    manufacturingNo: '',
+    measurePersonId: '',
     approvalStatus: active.value, // 审批状态
     certificateReportCode: '', //		证书编号
     certificateReportName: '', //		证书名称
@@ -293,6 +301,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
+const userList: any = ref([]) // 计量人员列表
 // 获取字典值
 const getDict = async () => {
   // 审批状态
@@ -316,7 +325,24 @@
   response.data.forEach((item: any) => {
     certificateReportCategoryDict.value[`${item.value}`] = item.name
   })
+
+  // 获取计量人员列表
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  // 获取人员列表
+  getStaffList(params).then((res) => {
+    userList.value = res.data.records
+  })
 }
+
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
   active.value = val
@@ -379,6 +405,30 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measurePersonId" filterable clearable placeholder="检定员"
+        >
+          <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+            <span style="float: left;">{{ item.name }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+          </el-option>
+        </el-select>
+      </search-item>
       <search-item v-if="active === '0'">
         <el-select
           v-model="listQuery.certificateReportType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index c23f6ce..99d40fc 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -41,6 +41,8 @@
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托单编号
   customerNo: '', // 委托方代码
   startTime: '', // 预计送达开始时间
@@ -59,6 +61,8 @@
 listQuery.value = renewSearchParams('schedule-interchange') || {
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托单编号
   customerNo: '', // 委托方代码
   startTime: '', // 预计送达开始时间
@@ -72,7 +76,7 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头待收入
 const columnsTaking = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
@@ -85,7 +89,7 @@
   { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
@@ -200,6 +204,8 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    manufacturingNo: '', // 出厂编号
     orderNo: '', // 委托单编号
     customerNo: '', // 委托方代码
     startTime: '', // 预计送达开始时间
@@ -257,6 +263,8 @@
   if (list.value.length > 0) {
     const params = {
       sampleNo: listQuery.value.sampleNo, // 样品编号
+      sampleModel: listQuery.value.sampleModel, // 型号
+      manufacturingNo: listQuery.value.manufacturingNo, // 出厂编号
       sampleName: listQuery.value.sampleName, // 样品名称
       orderNo: listQuery.value.orderNo, // 委托单编号
       customerNo: listQuery.value.customerNo, // 委托方代码
@@ -548,14 +556,14 @@
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           class="short-input"
           clearable
         />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input
           v-model.trim="listQuery.sampleName"
@@ -566,6 +574,22 @@
       </search-item>
       <search-item>
         <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
           v-model.trim="listQuery.orderNo"
           placeholder="委托单编号"
           class="short-input"
@@ -740,7 +764,7 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
     <!-- 终止弹窗 -->
     <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
     <scan-sample-dialog ref="scanSampleRef" :title="dialogTitle" @confirm="scanOver" />
diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts
index c93108d..44baa50 100644
--- a/src/views/business/schedule/interchange/interchange_interface.ts
+++ b/src/views/business/schedule/interchange/interchange_interface.ts
@@ -3,6 +3,8 @@
 export interface IListQuery {
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
   orderNo: string // 委托单编号
   customerId?: string // 委托方代码
   customerNo?: string // 委托方代码

diff --git a/src/api/business/lab/certificateReportRetrieval.ts b/src/api/business/lab/certificateReportRetrieval.ts
index dbb24c7..2d0236d 100644
--- a/src/api/business/lab/certificateReportRetrieval.ts
+++ b/src/api/business/lab/certificateReportRetrieval.ts
@@ -10,3 +10,12 @@
     data,
   })
 }
+
+// 证书更换
+export function changeCert(data: { certificatePrintId: string; minioFileName: string }) {
+  return request({
+    url: '/business/certificatePrint/change',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index f8d9960..9581187 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -5,10 +5,11 @@
 import DetailDialog from './detailDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
-import { getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
+import { changeCert, getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
 import { getStaffList } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { download } from '@/utils/download'
+import { UploadFile } from '@/api/measure/file'
 
 import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
@@ -23,6 +24,7 @@
   certificateName: '', // 证书名称
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
   manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托方编号
   customerName: '', // 委托方名称
@@ -38,8 +40,9 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateNo', align: 'center' },
   { text: '证书名称', value: 'certificateName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', align: 'center' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方编号', value: 'orderNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
@@ -75,6 +78,7 @@
     certificateName: '', // 证书名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    sampleModel: '', // 型号
     manufacturingNo: '', // 出厂编号
     orderNo: '', // 委托方编号
     customerName: '', // 委托方名称
@@ -170,6 +174,59 @@
     })
   })
 }
+
+// -----------------------------------------更换证书-------------------------------------------
+const fileRef = ref() // 文件上传input
+const changeCertificateReportId = ref('')
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    const loading = ElLoading.service({
+      lock: true,
+      text: '加载中...',
+      background: 'rgba(255, 255, 255, 0.6)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        // ElMessage.success('文件上传成功')
+        event.target.value = ''
+        const params = {
+          minioFileName: res.data[0],
+          certificatePrintId: changeCertificateReportId.value,
+        }
+        changeCert(params).then(() => {
+          ElMessage.success('更换证书成功')
+          loading.close()
+        }).catch(() => {
+          ElMessage.warning('文件上传失败')
+          loading.close()
+        })
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    }).catch(() => {
+      ElMessage.warning('文件上传失败')
+      loading.close()
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 点击更换证书
+const clickChangeCert = (row: any) => {
+  changeCertificateReportId.value = row.id
+  upload()
+}
+// -------------------------------------------------------------------------------------------------
 </script>
 
 <template>
@@ -193,15 +250,15 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
-          placeholder="样品编号"
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleName"
-          placeholder="样品名称"
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
           clearable
         />
       </search-item>
@@ -285,7 +342,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="130" fixed="right">
+          <el-table-column label="操作" align="center" width="180" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                 size="small"
@@ -304,6 +361,16 @@
                 下载
               </el-button>
 
+              <el-button
+                v-if="proxy.hasPerm('/schedule/certPrint/changeCert')"
+                size="small"
+                link
+                type="primary"
+                @click="clickChangeCert(row)"
+              >
+                更换证书
+              </el-button>
+
               <el-button v-if="proxy.hasPerm('/schedule/certPrint/recheck')" size="small" :disabled="row.printStatusName === '作废'" link type="primary" @click="recheck(row)">
                 重检
               </el-button>
@@ -312,5 +379,6 @@
         </template>
       </normal-table>
     </table-container>
+    <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 051be9a..78fbd04 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,5 +1,8 @@
 // 查询条件
 export interface IListQuery {
+  sampleModel: string
+  manufacturingNo: string
+  measurePersonId: string
   approvalStatus: string //	审批状态类型code
   certificateReportCode: string //		证书编号
   certificateReportName: string //		证书名称
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 80bc664..fc97efb 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -14,6 +14,7 @@
 // import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { getStaffList } from '@/api/measure/person'
 import { cancelApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
@@ -29,6 +30,9 @@
 const active = ref('')
 // 查询条件
 const listQuery = ref<IListQuery>({
+  sampleModel: '',
+  manufacturingNo: '',
+  measurePersonId: '',
   approvalStatus: active.value, // 审批状态
   certificateReportCode: '', //		证书编号
   certificateReportName: '', //		证书名称
@@ -71,9 +75,10 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
   { text: '证书名称', value: 'certificateReportName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  // { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '证书类别', value: 'certificateReportCategoryName', align: 'center', width: '120' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
@@ -114,6 +119,9 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
+    sampleModel: '',
+    manufacturingNo: '',
+    measurePersonId: '',
     approvalStatus: active.value, // 审批状态
     certificateReportCode: '', //		证书编号
     certificateReportName: '', //		证书名称
@@ -293,6 +301,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
+const userList: any = ref([]) // 计量人员列表
 // 获取字典值
 const getDict = async () => {
   // 审批状态
@@ -316,7 +325,24 @@
   response.data.forEach((item: any) => {
     certificateReportCategoryDict.value[`${item.value}`] = item.name
   })
+
+  // 获取计量人员列表
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  // 获取人员列表
+  getStaffList(params).then((res) => {
+    userList.value = res.data.records
+  })
 }
+
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
   active.value = val
@@ -379,6 +405,30 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measurePersonId" filterable clearable placeholder="检定员"
+        >
+          <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+            <span style="float: left;">{{ item.name }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+          </el-option>
+        </el-select>
+      </search-item>
       <search-item v-if="active === '0'">
         <el-select
           v-model="listQuery.certificateReportType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index c23f6ce..99d40fc 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -41,6 +41,8 @@
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托单编号
   customerNo: '', // 委托方代码
   startTime: '', // 预计送达开始时间
@@ -59,6 +61,8 @@
 listQuery.value = renewSearchParams('schedule-interchange') || {
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托单编号
   customerNo: '', // 委托方代码
   startTime: '', // 预计送达开始时间
@@ -72,7 +76,7 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头待收入
 const columnsTaking = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
@@ -85,7 +89,7 @@
   { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
@@ -200,6 +204,8 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    manufacturingNo: '', // 出厂编号
     orderNo: '', // 委托单编号
     customerNo: '', // 委托方代码
     startTime: '', // 预计送达开始时间
@@ -257,6 +263,8 @@
   if (list.value.length > 0) {
     const params = {
       sampleNo: listQuery.value.sampleNo, // 样品编号
+      sampleModel: listQuery.value.sampleModel, // 型号
+      manufacturingNo: listQuery.value.manufacturingNo, // 出厂编号
       sampleName: listQuery.value.sampleName, // 样品名称
       orderNo: listQuery.value.orderNo, // 委托单编号
       customerNo: listQuery.value.customerNo, // 委托方代码
@@ -548,14 +556,14 @@
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           class="short-input"
           clearable
         />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input
           v-model.trim="listQuery.sampleName"
@@ -566,6 +574,22 @@
       </search-item>
       <search-item>
         <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
           v-model.trim="listQuery.orderNo"
           placeholder="委托单编号"
           class="short-input"
@@ -740,7 +764,7 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
     <!-- 终止弹窗 -->
     <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
     <scan-sample-dialog ref="scanSampleRef" :title="dialogTitle" @confirm="scanOver" />
diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts
index c93108d..44baa50 100644
--- a/src/views/business/schedule/interchange/interchange_interface.ts
+++ b/src/views/business/schedule/interchange/interchange_interface.ts
@@ -3,6 +3,8 @@
 export interface IListQuery {
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
   orderNo: string // 委托单编号
   customerId?: string // 委托方代码
   customerNo?: string // 委托方代码
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 9d8bb2f..1f4b4e9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -2,6 +2,8 @@
 export interface ITaskQuery {
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
   orderNo: string // 委托单编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称

diff --git a/src/api/business/lab/certificateReportRetrieval.ts b/src/api/business/lab/certificateReportRetrieval.ts
index dbb24c7..2d0236d 100644
--- a/src/api/business/lab/certificateReportRetrieval.ts
+++ b/src/api/business/lab/certificateReportRetrieval.ts
@@ -10,3 +10,12 @@
     data,
   })
 }
+
+// 证书更换
+export function changeCert(data: { certificatePrintId: string; minioFileName: string }) {
+  return request({
+    url: '/business/certificatePrint/change',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index f8d9960..9581187 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -5,10 +5,11 @@
 import DetailDialog from './detailDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
-import { getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
+import { changeCert, getCertificateRetrievalList } from '@/api/business/lab/certificateReportRetrieval'
 import { getStaffList } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { download } from '@/utils/download'
+import { UploadFile } from '@/api/measure/file'
 
 import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
@@ -23,6 +24,7 @@
   certificateName: '', // 证书名称
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
   manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托方编号
   customerName: '', // 委托方名称
@@ -38,8 +40,9 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateNo', align: 'center' },
   { text: '证书名称', value: 'certificateName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', align: 'center' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '委托方编号', value: 'orderNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
@@ -75,6 +78,7 @@
     certificateName: '', // 证书名称
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    sampleModel: '', // 型号
     manufacturingNo: '', // 出厂编号
     orderNo: '', // 委托方编号
     customerName: '', // 委托方名称
@@ -170,6 +174,59 @@
     })
   })
 }
+
+// -----------------------------------------更换证书-------------------------------------------
+const fileRef = ref() // 文件上传input
+const changeCertificateReportId = ref('')
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  const files = event.target.files
+  if (files.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    for (var i = 0; i < files.length; i++) {
+      fd.append('multipartFile', files[i])
+    }
+    const loading = ElLoading.service({
+      lock: true,
+      text: '加载中...',
+      background: 'rgba(255, 255, 255, 0.6)',
+    })
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        // ElMessage.success('文件上传成功')
+        event.target.value = ''
+        const params = {
+          minioFileName: res.data[0],
+          certificatePrintId: changeCertificateReportId.value,
+        }
+        changeCert(params).then(() => {
+          ElMessage.success('更换证书成功')
+          loading.close()
+        }).catch(() => {
+          ElMessage.warning('文件上传失败')
+          loading.close()
+        })
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    }).catch(() => {
+      ElMessage.warning('文件上传失败')
+      loading.close()
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 点击更换证书
+const clickChangeCert = (row: any) => {
+  changeCertificateReportId.value = row.id
+  upload()
+}
+// -------------------------------------------------------------------------------------------------
 </script>
 
 <template>
@@ -193,15 +250,15 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleNo"
-          placeholder="样品编号"
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.sampleName"
-          placeholder="样品名称"
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
           clearable
         />
       </search-item>
@@ -285,7 +342,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="130" fixed="right">
+          <el-table-column label="操作" align="center" width="180" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                 size="small"
@@ -304,6 +361,16 @@
                 下载
               </el-button>
 
+              <el-button
+                v-if="proxy.hasPerm('/schedule/certPrint/changeCert')"
+                size="small"
+                link
+                type="primary"
+                @click="clickChangeCert(row)"
+              >
+                更换证书
+              </el-button>
+
               <el-button v-if="proxy.hasPerm('/schedule/certPrint/recheck')" size="small" :disabled="row.printStatusName === '作废'" link type="primary" @click="recheck(row)">
                 重检
               </el-button>
@@ -312,5 +379,6 @@
         </template>
       </normal-table>
     </table-container>
+    <input v-show="false" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
   </app-container>
 </template>
diff --git a/src/views/business/lab/measureData/measureData-interface.ts b/src/views/business/lab/measureData/measureData-interface.ts
index 051be9a..78fbd04 100644
--- a/src/views/business/lab/measureData/measureData-interface.ts
+++ b/src/views/business/lab/measureData/measureData-interface.ts
@@ -1,5 +1,8 @@
 // 查询条件
 export interface IListQuery {
+  sampleModel: string
+  manufacturingNo: string
+  measurePersonId: string
   approvalStatus: string //	审批状态类型code
   certificateReportCode: string //		证书编号
   certificateReportName: string //		证书名称
diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue
index 80bc664..fc97efb 100644
--- a/src/views/business/lab/measureData/measureDataList.vue
+++ b/src/views/business/lab/measureData/measureDataList.vue
@@ -14,6 +14,7 @@
 // import ApprovalDialog from '@/components/Approval/ApprovalDialogByProcess.vue'
 import ButtonBox from '@/components/buttonBox/buttonBox.vue'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
+import { getStaffList } from '@/api/measure/person'
 import { cancelApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
@@ -29,6 +30,9 @@
 const active = ref('')
 // 查询条件
 const listQuery = ref<IListQuery>({
+  sampleModel: '',
+  manufacturingNo: '',
+  measurePersonId: '',
   approvalStatus: active.value, // 审批状态
   certificateReportCode: '', //		证书编号
   certificateReportName: '', //		证书名称
@@ -71,9 +75,10 @@
 const columns = ref<TableColumn[]>([
   { text: '证书编号', value: 'certificateReportCode', width: '160', align: 'center' },
   { text: '证书名称', value: 'certificateReportName', align: 'center' },
-  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  // { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '证书类别', value: 'certificateReportCategoryName', align: 'center', width: '120' },
   { text: '委托单编号', value: 'orderCode_hide', align: 'center', followLink: true, width: '160' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
@@ -114,6 +119,9 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
+    sampleModel: '',
+    manufacturingNo: '',
+    measurePersonId: '',
     approvalStatus: active.value, // 审批状态
     certificateReportCode: '', //		证书编号
     certificateReportName: '', //		证书名称
@@ -293,6 +301,7 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
+const userList: any = ref([]) // 计量人员列表
 // 获取字典值
 const getDict = async () => {
   // 审批状态
@@ -316,7 +325,24 @@
   response.data.forEach((item: any) => {
     certificateReportCategoryDict.value[`${item.value}`] = item.name
   })
+
+  // 获取计量人员列表
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  // 获取人员列表
+  getStaffList(params).then((res) => {
+    userList.value = res.data.records
+  })
 }
+
 // 切换tab状态
 const changeCurrentButton = (val: string) => {
   active.value = val
@@ -379,6 +405,30 @@
           clearable
         />
       </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.measurePersonId" filterable clearable placeholder="检定员"
+        >
+          <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+            <span style="float: left;">{{ item.name }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
+          </el-option>
+        </el-select>
+      </search-item>
       <search-item v-if="active === '0'">
         <el-select
           v-model="listQuery.certificateReportType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index c23f6ce..99d40fc 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -41,6 +41,8 @@
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托单编号
   customerNo: '', // 委托方代码
   startTime: '', // 预计送达开始时间
@@ -59,6 +61,8 @@
 listQuery.value = renewSearchParams('schedule-interchange') || {
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托单编号
   customerNo: '', // 委托方代码
   startTime: '', // 预计送达开始时间
@@ -72,7 +76,7 @@
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表头待收入
 const columnsTaking = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
@@ -85,7 +89,7 @@
   { text: '预计送达时间', value: 'planDeliverTime', width: '180', align: 'center' },
 ])
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
@@ -200,6 +204,8 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    manufacturingNo: '', // 出厂编号
     orderNo: '', // 委托单编号
     customerNo: '', // 委托方代码
     startTime: '', // 预计送达开始时间
@@ -257,6 +263,8 @@
   if (list.value.length > 0) {
     const params = {
       sampleNo: listQuery.value.sampleNo, // 样品编号
+      sampleModel: listQuery.value.sampleModel, // 型号
+      manufacturingNo: listQuery.value.manufacturingNo, // 出厂编号
       sampleName: listQuery.value.sampleName, // 样品名称
       orderNo: listQuery.value.orderNo, // 委托单编号
       customerNo: listQuery.value.customerNo, // 委托方代码
@@ -548,14 +556,14 @@
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.sampleNo"
           placeholder="样品编号"
           class="short-input"
           clearable
         />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input
           v-model.trim="listQuery.sampleName"
@@ -566,6 +574,22 @@
       </search-item>
       <search-item>
         <el-input
+          v-model.trim="listQuery.sampleModel"
+          placeholder="型号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.manufacturingNo"
+          placeholder="出厂编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
           v-model.trim="listQuery.orderNo"
           placeholder="委托单编号"
           class="short-input"
@@ -740,7 +764,7 @@
         </template>
       </normal-table>
     </table-container>
-    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
     <!-- 终止弹窗 -->
     <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
     <scan-sample-dialog ref="scanSampleRef" :title="dialogTitle" @confirm="scanOver" />
diff --git a/src/views/business/schedule/interchange/interchange_interface.ts b/src/views/business/schedule/interchange/interchange_interface.ts
index c93108d..44baa50 100644
--- a/src/views/business/schedule/interchange/interchange_interface.ts
+++ b/src/views/business/schedule/interchange/interchange_interface.ts
@@ -3,6 +3,8 @@
 export interface IListQuery {
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
   orderNo: string // 委托单编号
   customerId?: string // 委托方代码
   customerNo?: string // 委托方代码
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index 9d8bb2f..1f4b4e9 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -2,6 +2,8 @@
 export interface ITaskQuery {
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
   orderNo: string // 委托单编号
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 2aa6b0c..b600a20 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -28,6 +28,8 @@
 const listQuery: Ref<ITaskQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
+  sampleModel: '', // 型号
+  manufacturingNo: '', // 出厂编号
   orderNo: '', // 委托单编号
   customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
@@ -92,7 +94,7 @@
 }
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
+  // { text: '样品编号', value: 'sampleNo', width: '160', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
@@ -148,6 +150,8 @@
   listQuery.value = {
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
+    sampleModel: '', // 型号
+    manufacturingNo: '', // 出厂编号
     orderNo: '', // 委托单编号
     customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
@@ -241,6 +245,8 @@
     const obj = {
       sampleNo: '', // 样品编号
       sampleName: '', // 样品名称
+      sampleModel: '', // 型号
+      manufacturingNo: '', // 出厂编号
       orderNo: '', // 委托单编号
       customerNo: '', // 委托方代码
       customerName: '', // 委托方名称
@@ -345,13 +351,19 @@
       </el-radio-group>
     </div>
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.sampleNo" placeholder="样品编号" class="short-input" clearable />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.sampleName" placeholder="样品名称" clearable class="short-input" />
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.sampleModel" placeholder="型号" clearable class="short-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.manufacturingNo" placeholder="出厂编号" clearable class="short-input" />
+      </search-item>
+      <search-item>
         <el-input v-model.trim="listQuery.orderNo" placeholder="委托单编号" clearable class="short-input" />
       </search-item>
       <search-item>