diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 32b5cd5..9b1c4a9 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -78,3 +78,12 @@
     },
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/certificatePrint/batchImport',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 32b5cd5..9b1c4a9 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -78,3 +78,12 @@
     },
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/certificatePrint/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 9e3ce0a..fc72918 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -57,3 +57,12 @@
     data,
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/outsourceCertificate/batchImport',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 32b5cd5..9b1c4a9 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -78,3 +78,12 @@
     },
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/certificatePrint/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 9e3ce0a..fc72918 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -57,3 +57,12 @@
     data,
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/outsourceCertificate/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index bf4fb0e..88b318e 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -95,3 +95,11 @@
   })
 }
 
+// 列表-分包档案删除
+export function deleteList(data: { ids: string[] }) {
+  return request({
+    url: '/business/outsourcer/batchDelete',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 32b5cd5..9b1c4a9 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -78,3 +78,12 @@
     },
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/certificatePrint/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 9e3ce0a..fc72918 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -57,3 +57,12 @@
     data,
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/outsourceCertificate/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index bf4fb0e..88b318e 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -95,3 +95,11 @@
   })
 }
 
+// 列表-分包档案删除
+export function deleteList(data: { ids: string[] }) {
+  return request({
+    url: '/business/outsourcer/batchDelete',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index e792799..93f007a 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -11,7 +11,7 @@
 import { download } from '@/utils/download'
 import { UploadFile } from '@/api/measure/file'
 
-import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
+import { batchImport, certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
@@ -132,16 +132,22 @@
 }
 
 // 点击下载
-const downloadFile = (row: any) => {
-  if (row.printFileName) {
+const downloadFile = (row: any, type: 'cert' | 'scanPdf') => {
+  let fileUrl = ''
+  let fileName = ''
+  if (type === 'cert' && row.printFileName) { fileUrl = row.printFileName }
+  if (type === 'scanPdf' && row.certificateReportPdf) { fileUrl = row.certificateReportPdf }
+  if (fileUrl) {
     const loading = ElLoading.service({
       lock: true,
       text: '下载中，请稍后...',
       background: 'rgba(255, 255, 255, 0.6)',
     })
-    getPhotoUrl(row.printFileName).then((res) => {
+    getPhotoUrl(fileUrl).then((res) => {
       const fileType = res.data.split('.')[res.data.split('.').length - 1]
-      download(res.data, `${row.certificateName}.${fileType}` as string)
+      if (type === 'cert') { fileName = `${row.certificateName}.${fileType}` }
+      if (type === 'scanPdf') { fileName = row.certificateReportPdf }
+      download(res.data, fileName)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
@@ -178,48 +184,73 @@
 
 // -----------------------------------------更换证书-------------------------------------------
 const fileRef = ref() // 文件上传input
+const importFileType = ref('changeCert')
 const changeCertificateReportId = ref('')
 const onFileChange = (event: any) => {
   // 原生上传
-  console.log(event.target.files)
-  const files = event.target.files
-  if (files.length !== 0) {
+  if (importFileType.value === 'changeCert') {
+    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) {
+      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,
+          event.target.value = ''
+          const params = {
+            minioFileName: res.data[0],
+            certificatePrintId: changeCertificateReportId.value,
+          }
+          changeCert(params).then(() => {
+            ElMessage.success('更换证书成功')
+            loading.close()
+          }).catch(() => {
+            ElMessage.warning('文件上传失败')
+            loading.close()
+          })
         }
-        changeCert(params).then(() => {
-          ElMessage.success('更换证书成功')
+        else {
+          ElMessage.error(res.message)
+        }
+      }).catch(() => {
+        ElMessage.warning('文件上传失败')
+        loading.close()
+      })
+    }
+  }
+  else if (importFileType.value === 'batchImport') {
+    if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+      const fd = new FormData()
+      fd.append('file', event.target.files[0])
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      batchImport(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('批量导入成功')
+          fetchData(false)
           loading.close()
-        }).catch(() => {
-          ElMessage.warning('文件上传失败')
-          loading.close()
-        })
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    }).catch(() => {
-      ElMessage.warning('文件上传失败')
-      loading.close()
-    })
+          event.target.value = ''
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
   }
 }
 const upload = () => {
+  importFileType.value = 'changeCert'
   fileRef.value.click()
 }
 // 点击更换证书
@@ -227,6 +258,12 @@
   changeCertificateReportId.value = row.id
   upload()
 }
+
+// 批量导入
+const handleBatchImport = () => {
+  importFileType.value = 'batchImport'
+  fileRef.value.click()
+}
 // -------------------------------------------------------------------------------------------------
 </script>
 
@@ -316,6 +353,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-import" title="证书扫描件批量导入" type="primary" @click="handleBatchImport" />
+      </template>
       <normal-table
         :data="list"
         :total="total"
@@ -343,7 +383,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="180" fixed="right">
+          <el-table-column label="操作" align="center" width="240" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                 size="small"
@@ -356,8 +396,18 @@
               <el-button
                 size="small"
                 link
+                :disabled="!row.certificateReportPdf"
                 type="primary"
-                @click="downloadFile(row)"
+                @click="downloadFile(row, 'scanPdf')"
+              >
+                扫描件下载
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                :disabled="!row.printFileName"
+                @click="downloadFile(row, 'cert')"
               >
                 下载
               </el-button>

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 32b5cd5..9b1c4a9 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -78,3 +78,12 @@
     },
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/certificatePrint/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 9e3ce0a..fc72918 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -57,3 +57,12 @@
     data,
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/outsourceCertificate/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index bf4fb0e..88b318e 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -95,3 +95,11 @@
   })
 }
 
+// 列表-分包档案删除
+export function deleteList(data: { ids: string[] }) {
+  return request({
+    url: '/business/outsourcer/batchDelete',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index e792799..93f007a 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -11,7 +11,7 @@
 import { download } from '@/utils/download'
 import { UploadFile } from '@/api/measure/file'
 
-import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
+import { batchImport, certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
@@ -132,16 +132,22 @@
 }
 
 // 点击下载
-const downloadFile = (row: any) => {
-  if (row.printFileName) {
+const downloadFile = (row: any, type: 'cert' | 'scanPdf') => {
+  let fileUrl = ''
+  let fileName = ''
+  if (type === 'cert' && row.printFileName) { fileUrl = row.printFileName }
+  if (type === 'scanPdf' && row.certificateReportPdf) { fileUrl = row.certificateReportPdf }
+  if (fileUrl) {
     const loading = ElLoading.service({
       lock: true,
       text: '下载中，请稍后...',
       background: 'rgba(255, 255, 255, 0.6)',
     })
-    getPhotoUrl(row.printFileName).then((res) => {
+    getPhotoUrl(fileUrl).then((res) => {
       const fileType = res.data.split('.')[res.data.split('.').length - 1]
-      download(res.data, `${row.certificateName}.${fileType}` as string)
+      if (type === 'cert') { fileName = `${row.certificateName}.${fileType}` }
+      if (type === 'scanPdf') { fileName = row.certificateReportPdf }
+      download(res.data, fileName)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
@@ -178,48 +184,73 @@
 
 // -----------------------------------------更换证书-------------------------------------------
 const fileRef = ref() // 文件上传input
+const importFileType = ref('changeCert')
 const changeCertificateReportId = ref('')
 const onFileChange = (event: any) => {
   // 原生上传
-  console.log(event.target.files)
-  const files = event.target.files
-  if (files.length !== 0) {
+  if (importFileType.value === 'changeCert') {
+    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) {
+      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,
+          event.target.value = ''
+          const params = {
+            minioFileName: res.data[0],
+            certificatePrintId: changeCertificateReportId.value,
+          }
+          changeCert(params).then(() => {
+            ElMessage.success('更换证书成功')
+            loading.close()
+          }).catch(() => {
+            ElMessage.warning('文件上传失败')
+            loading.close()
+          })
         }
-        changeCert(params).then(() => {
-          ElMessage.success('更换证书成功')
+        else {
+          ElMessage.error(res.message)
+        }
+      }).catch(() => {
+        ElMessage.warning('文件上传失败')
+        loading.close()
+      })
+    }
+  }
+  else if (importFileType.value === 'batchImport') {
+    if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+      const fd = new FormData()
+      fd.append('file', event.target.files[0])
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      batchImport(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('批量导入成功')
+          fetchData(false)
           loading.close()
-        }).catch(() => {
-          ElMessage.warning('文件上传失败')
-          loading.close()
-        })
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    }).catch(() => {
-      ElMessage.warning('文件上传失败')
-      loading.close()
-    })
+          event.target.value = ''
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
   }
 }
 const upload = () => {
+  importFileType.value = 'changeCert'
   fileRef.value.click()
 }
 // 点击更换证书
@@ -227,6 +258,12 @@
   changeCertificateReportId.value = row.id
   upload()
 }
+
+// 批量导入
+const handleBatchImport = () => {
+  importFileType.value = 'batchImport'
+  fileRef.value.click()
+}
 // -------------------------------------------------------------------------------------------------
 </script>
 
@@ -316,6 +353,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-import" title="证书扫描件批量导入" type="primary" @click="handleBatchImport" />
+      </template>
       <normal-table
         :data="list"
         :total="total"
@@ -343,7 +383,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="180" fixed="right">
+          <el-table-column label="操作" align="center" width="240" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                 size="small"
@@ -356,8 +396,18 @@
               <el-button
                 size="small"
                 link
+                :disabled="!row.certificateReportPdf"
                 type="primary"
-                @click="downloadFile(row)"
+                @click="downloadFile(row, 'scanPdf')"
+              >
+                扫描件下载
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                :disabled="!row.printFileName"
+                @click="downloadFile(row, 'cert')"
               >
                 下载
               </el-button>
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 1207727..4cb6b22 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -11,7 +11,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getPhotoUrl } from '@/api/system/tool'
 import filePreviewDialog from '@/views/business/schedule/certPrint/components/filePreviewDialog.vue'
-import { delCertificate, exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
+import { batchImport, delCertificate, exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -242,6 +242,36 @@
     })
 }
 
+// --------------------------------------文件导入-------------------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('file', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    batchImport(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('批量导入成功')
+        fetchData()
+        loading.close()
+        event.target.value = ''
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+// 批量导入
+const handleBatchImport = () => {
+  fileRef.value.click()
+}
+// ----------------------------------------------------------------------------------------
+
 onMounted(async () => {
   fetchData()
 })
@@ -273,7 +303,8 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <!-- <icon-button icon="icon-import" title="批量导入" type="primary" /> -->
+          <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
+          <icon-button icon="icon-import" title="批量导入" type="primary" @click="handleBatchImport" />
           <!-- <icon-button icon="icon-template" title="模板下载" type="primary" /> -->
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 32b5cd5..9b1c4a9 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -78,3 +78,12 @@
     },
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/certificatePrint/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 9e3ce0a..fc72918 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -57,3 +57,12 @@
     data,
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/outsourceCertificate/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index bf4fb0e..88b318e 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -95,3 +95,11 @@
   })
 }
 
+// 列表-分包档案删除
+export function deleteList(data: { ids: string[] }) {
+  return request({
+    url: '/business/outsourcer/batchDelete',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index e792799..93f007a 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -11,7 +11,7 @@
 import { download } from '@/utils/download'
 import { UploadFile } from '@/api/measure/file'
 
-import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
+import { batchImport, certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
@@ -132,16 +132,22 @@
 }
 
 // 点击下载
-const downloadFile = (row: any) => {
-  if (row.printFileName) {
+const downloadFile = (row: any, type: 'cert' | 'scanPdf') => {
+  let fileUrl = ''
+  let fileName = ''
+  if (type === 'cert' && row.printFileName) { fileUrl = row.printFileName }
+  if (type === 'scanPdf' && row.certificateReportPdf) { fileUrl = row.certificateReportPdf }
+  if (fileUrl) {
     const loading = ElLoading.service({
       lock: true,
       text: '下载中，请稍后...',
       background: 'rgba(255, 255, 255, 0.6)',
     })
-    getPhotoUrl(row.printFileName).then((res) => {
+    getPhotoUrl(fileUrl).then((res) => {
       const fileType = res.data.split('.')[res.data.split('.').length - 1]
-      download(res.data, `${row.certificateName}.${fileType}` as string)
+      if (type === 'cert') { fileName = `${row.certificateName}.${fileType}` }
+      if (type === 'scanPdf') { fileName = row.certificateReportPdf }
+      download(res.data, fileName)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
@@ -178,48 +184,73 @@
 
 // -----------------------------------------更换证书-------------------------------------------
 const fileRef = ref() // 文件上传input
+const importFileType = ref('changeCert')
 const changeCertificateReportId = ref('')
 const onFileChange = (event: any) => {
   // 原生上传
-  console.log(event.target.files)
-  const files = event.target.files
-  if (files.length !== 0) {
+  if (importFileType.value === 'changeCert') {
+    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) {
+      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,
+          event.target.value = ''
+          const params = {
+            minioFileName: res.data[0],
+            certificatePrintId: changeCertificateReportId.value,
+          }
+          changeCert(params).then(() => {
+            ElMessage.success('更换证书成功')
+            loading.close()
+          }).catch(() => {
+            ElMessage.warning('文件上传失败')
+            loading.close()
+          })
         }
-        changeCert(params).then(() => {
-          ElMessage.success('更换证书成功')
+        else {
+          ElMessage.error(res.message)
+        }
+      }).catch(() => {
+        ElMessage.warning('文件上传失败')
+        loading.close()
+      })
+    }
+  }
+  else if (importFileType.value === 'batchImport') {
+    if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+      const fd = new FormData()
+      fd.append('file', event.target.files[0])
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      batchImport(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('批量导入成功')
+          fetchData(false)
           loading.close()
-        }).catch(() => {
-          ElMessage.warning('文件上传失败')
-          loading.close()
-        })
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    }).catch(() => {
-      ElMessage.warning('文件上传失败')
-      loading.close()
-    })
+          event.target.value = ''
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
   }
 }
 const upload = () => {
+  importFileType.value = 'changeCert'
   fileRef.value.click()
 }
 // 点击更换证书
@@ -227,6 +258,12 @@
   changeCertificateReportId.value = row.id
   upload()
 }
+
+// 批量导入
+const handleBatchImport = () => {
+  importFileType.value = 'batchImport'
+  fileRef.value.click()
+}
 // -------------------------------------------------------------------------------------------------
 </script>
 
@@ -316,6 +353,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-import" title="证书扫描件批量导入" type="primary" @click="handleBatchImport" />
+      </template>
       <normal-table
         :data="list"
         :total="total"
@@ -343,7 +383,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="180" fixed="right">
+          <el-table-column label="操作" align="center" width="240" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                 size="small"
@@ -356,8 +396,18 @@
               <el-button
                 size="small"
                 link
+                :disabled="!row.certificateReportPdf"
                 type="primary"
-                @click="downloadFile(row)"
+                @click="downloadFile(row, 'scanPdf')"
+              >
+                扫描件下载
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                :disabled="!row.printFileName"
+                @click="downloadFile(row, 'cert')"
               >
                 下载
               </el-button>
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 1207727..4cb6b22 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -11,7 +11,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getPhotoUrl } from '@/api/system/tool'
 import filePreviewDialog from '@/views/business/schedule/certPrint/components/filePreviewDialog.vue'
-import { delCertificate, exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
+import { batchImport, delCertificate, exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -242,6 +242,36 @@
     })
 }
 
+// --------------------------------------文件导入-------------------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('file', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    batchImport(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('批量导入成功')
+        fetchData()
+        loading.close()
+        event.target.value = ''
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+// 批量导入
+const handleBatchImport = () => {
+  fileRef.value.click()
+}
+// ----------------------------------------------------------------------------------------
+
 onMounted(async () => {
   fetchData()
 })
@@ -273,7 +303,8 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <!-- <icon-button icon="icon-import" title="批量导入" type="primary" /> -->
+          <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
+          <icon-button icon="icon-import" title="批量导入" type="primary" @click="handleBatchImport" />
           <!-- <icon-button icon="icon-template" title="模板下载" type="primary" /> -->
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 4f56253..86b1149 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -10,7 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/views/device/receive/receive'
 import useTemplateDownload from '@/utils/useTemplateDownload'
-import { batchImportSubpackageRecord, exportRecordList, getListPage } from '@/api/business/subpackage/record'
+import { batchImportSubpackageRecord, deleteList, exportRecordList, getListPage } from '@/api/business/subpackage/record'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
@@ -179,6 +179,25 @@
   })
 }
 
+// 点击删除
+const del = (row: IList) => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteList({ ids: [row.id] }).then(() => {
+        ElMessage.success('删除成功')
+        fetchData(true)
+      })
+    })
+}
+
 // -------------------------------------模板下载、批量导入-----------------------------------
 // 模板下载
 const templateDownload = () => {
@@ -272,7 +291,7 @@
               label="操作"
               align="center"
               fixed="right"
-              :width="90"
+              :width="110"
             >
               <template #default="{ row }">
                 <el-button
@@ -283,6 +302,14 @@
                 >
                   详情
                 </el-button>
+                <el-button
+                  size="small"
+                  type="danger"
+                  link
+                  @click="del(row)"
+                >
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 32b5cd5..9b1c4a9 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -78,3 +78,12 @@
     },
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/certificatePrint/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 9e3ce0a..fc72918 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -57,3 +57,12 @@
     data,
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/outsourceCertificate/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index bf4fb0e..88b318e 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -95,3 +95,11 @@
   })
 }
 
+// 列表-分包档案删除
+export function deleteList(data: { ids: string[] }) {
+  return request({
+    url: '/business/outsourcer/batchDelete',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index e792799..93f007a 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -11,7 +11,7 @@
 import { download } from '@/utils/download'
 import { UploadFile } from '@/api/measure/file'
 
-import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
+import { batchImport, certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
@@ -132,16 +132,22 @@
 }
 
 // 点击下载
-const downloadFile = (row: any) => {
-  if (row.printFileName) {
+const downloadFile = (row: any, type: 'cert' | 'scanPdf') => {
+  let fileUrl = ''
+  let fileName = ''
+  if (type === 'cert' && row.printFileName) { fileUrl = row.printFileName }
+  if (type === 'scanPdf' && row.certificateReportPdf) { fileUrl = row.certificateReportPdf }
+  if (fileUrl) {
     const loading = ElLoading.service({
       lock: true,
       text: '下载中，请稍后...',
       background: 'rgba(255, 255, 255, 0.6)',
     })
-    getPhotoUrl(row.printFileName).then((res) => {
+    getPhotoUrl(fileUrl).then((res) => {
       const fileType = res.data.split('.')[res.data.split('.').length - 1]
-      download(res.data, `${row.certificateName}.${fileType}` as string)
+      if (type === 'cert') { fileName = `${row.certificateName}.${fileType}` }
+      if (type === 'scanPdf') { fileName = row.certificateReportPdf }
+      download(res.data, fileName)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
@@ -178,48 +184,73 @@
 
 // -----------------------------------------更换证书-------------------------------------------
 const fileRef = ref() // 文件上传input
+const importFileType = ref('changeCert')
 const changeCertificateReportId = ref('')
 const onFileChange = (event: any) => {
   // 原生上传
-  console.log(event.target.files)
-  const files = event.target.files
-  if (files.length !== 0) {
+  if (importFileType.value === 'changeCert') {
+    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) {
+      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,
+          event.target.value = ''
+          const params = {
+            minioFileName: res.data[0],
+            certificatePrintId: changeCertificateReportId.value,
+          }
+          changeCert(params).then(() => {
+            ElMessage.success('更换证书成功')
+            loading.close()
+          }).catch(() => {
+            ElMessage.warning('文件上传失败')
+            loading.close()
+          })
         }
-        changeCert(params).then(() => {
-          ElMessage.success('更换证书成功')
+        else {
+          ElMessage.error(res.message)
+        }
+      }).catch(() => {
+        ElMessage.warning('文件上传失败')
+        loading.close()
+      })
+    }
+  }
+  else if (importFileType.value === 'batchImport') {
+    if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+      const fd = new FormData()
+      fd.append('file', event.target.files[0])
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      batchImport(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('批量导入成功')
+          fetchData(false)
           loading.close()
-        }).catch(() => {
-          ElMessage.warning('文件上传失败')
-          loading.close()
-        })
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    }).catch(() => {
-      ElMessage.warning('文件上传失败')
-      loading.close()
-    })
+          event.target.value = ''
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
   }
 }
 const upload = () => {
+  importFileType.value = 'changeCert'
   fileRef.value.click()
 }
 // 点击更换证书
@@ -227,6 +258,12 @@
   changeCertificateReportId.value = row.id
   upload()
 }
+
+// 批量导入
+const handleBatchImport = () => {
+  importFileType.value = 'batchImport'
+  fileRef.value.click()
+}
 // -------------------------------------------------------------------------------------------------
 </script>
 
@@ -316,6 +353,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-import" title="证书扫描件批量导入" type="primary" @click="handleBatchImport" />
+      </template>
       <normal-table
         :data="list"
         :total="total"
@@ -343,7 +383,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="180" fixed="right">
+          <el-table-column label="操作" align="center" width="240" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                 size="small"
@@ -356,8 +396,18 @@
               <el-button
                 size="small"
                 link
+                :disabled="!row.certificateReportPdf"
                 type="primary"
-                @click="downloadFile(row)"
+                @click="downloadFile(row, 'scanPdf')"
+              >
+                扫描件下载
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                :disabled="!row.printFileName"
+                @click="downloadFile(row, 'cert')"
               >
                 下载
               </el-button>
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 1207727..4cb6b22 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -11,7 +11,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getPhotoUrl } from '@/api/system/tool'
 import filePreviewDialog from '@/views/business/schedule/certPrint/components/filePreviewDialog.vue'
-import { delCertificate, exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
+import { batchImport, delCertificate, exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -242,6 +242,36 @@
     })
 }
 
+// --------------------------------------文件导入-------------------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('file', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    batchImport(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('批量导入成功')
+        fetchData()
+        loading.close()
+        event.target.value = ''
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+// 批量导入
+const handleBatchImport = () => {
+  fileRef.value.click()
+}
+// ----------------------------------------------------------------------------------------
+
 onMounted(async () => {
   fetchData()
 })
@@ -273,7 +303,8 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <!-- <icon-button icon="icon-import" title="批量导入" type="primary" /> -->
+          <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
+          <icon-button icon="icon-import" title="批量导入" type="primary" @click="handleBatchImport" />
           <!-- <icon-button icon="icon-template" title="模板下载" type="primary" /> -->
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 4f56253..86b1149 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -10,7 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/views/device/receive/receive'
 import useTemplateDownload from '@/utils/useTemplateDownload'
-import { batchImportSubpackageRecord, exportRecordList, getListPage } from '@/api/business/subpackage/record'
+import { batchImportSubpackageRecord, deleteList, exportRecordList, getListPage } from '@/api/business/subpackage/record'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
@@ -179,6 +179,25 @@
   })
 }
 
+// 点击删除
+const del = (row: IList) => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteList({ ids: [row.id] }).then(() => {
+        ElMessage.success('删除成功')
+        fetchData(true)
+      })
+    })
+}
+
 // -------------------------------------模板下载、批量导入-----------------------------------
 // 模板下载
 const templateDownload = () => {
@@ -272,7 +291,7 @@
               label="操作"
               align="center"
               fixed="right"
-              :width="90"
+              :width="110"
             >
               <template #default="{ row }">
                 <el-button
@@ -283,6 +302,14 @@
                 >
                   详情
                 </el-button>
+                <el-button
+                  size="small"
+                  type="danger"
+                  link
+                  @click="del(row)"
+                >
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 824f0f8..f047365 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -31,6 +31,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const measureWayList = ref<dictType[]>([]) // 检测方式
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const userList = ref<any[]>([]) // 人员列表
 const ABCList = ref<dictType[]>([]) // ABC
@@ -67,6 +68,7 @@
 
   busPersonId: '', 	// 业务员id
   busPersonName: '', 	// 业务员名字
+  sampleBelong: '1', // 样品属性
 })// 表单
 const ruleFormRef = ref<FormInstance>()
 
@@ -98,6 +100,7 @@
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
   // busPersonId: [{ required: true, message: '业务员必填', trigger: 'change' }],
   // powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
+  sampleBelong: [{ required: true, message: '样品属性必填', trigger: 'change' }],
 }) // 表单验证规则
 
 // 其他关联数据列表
@@ -108,6 +111,10 @@
 
 // 获取字典值
 function getDict() {
+  // 获取样品属性
+  getDictByCode('sampleBelong').then((response) => {
+    sampleBelongList.value = response.data
+  })
   // 校检类别
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
@@ -697,6 +704,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品属性:" prop="sampleBelong">
+                <el-select
+                  v-model="dataForm.sampleBelong"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of sampleBelongList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
@@ -755,7 +774,7 @@
     </detail-block-switch>
 
     <!-- 选择委托方组件 -->
-    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <select-customer v-model:visible="visible" @confirm-checkout="confirmCheckout" @change-visible="changeVisible" />
     <scan-sample-dialog ref="scanSampleRef" title="标签绑定" @confirm="scanOver" />
   </app-container>
 </template>

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 32b5cd5..9b1c4a9 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -78,3 +78,12 @@
     },
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/certificatePrint/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 9e3ce0a..fc72918 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -57,3 +57,12 @@
     data,
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/outsourceCertificate/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index bf4fb0e..88b318e 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -95,3 +95,11 @@
   })
 }
 
+// 列表-分包档案删除
+export function deleteList(data: { ids: string[] }) {
+  return request({
+    url: '/business/outsourcer/batchDelete',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index e792799..93f007a 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -11,7 +11,7 @@
 import { download } from '@/utils/download'
 import { UploadFile } from '@/api/measure/file'
 
-import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
+import { batchImport, certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
@@ -132,16 +132,22 @@
 }
 
 // 点击下载
-const downloadFile = (row: any) => {
-  if (row.printFileName) {
+const downloadFile = (row: any, type: 'cert' | 'scanPdf') => {
+  let fileUrl = ''
+  let fileName = ''
+  if (type === 'cert' && row.printFileName) { fileUrl = row.printFileName }
+  if (type === 'scanPdf' && row.certificateReportPdf) { fileUrl = row.certificateReportPdf }
+  if (fileUrl) {
     const loading = ElLoading.service({
       lock: true,
       text: '下载中，请稍后...',
       background: 'rgba(255, 255, 255, 0.6)',
     })
-    getPhotoUrl(row.printFileName).then((res) => {
+    getPhotoUrl(fileUrl).then((res) => {
       const fileType = res.data.split('.')[res.data.split('.').length - 1]
-      download(res.data, `${row.certificateName}.${fileType}` as string)
+      if (type === 'cert') { fileName = `${row.certificateName}.${fileType}` }
+      if (type === 'scanPdf') { fileName = row.certificateReportPdf }
+      download(res.data, fileName)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
@@ -178,48 +184,73 @@
 
 // -----------------------------------------更换证书-------------------------------------------
 const fileRef = ref() // 文件上传input
+const importFileType = ref('changeCert')
 const changeCertificateReportId = ref('')
 const onFileChange = (event: any) => {
   // 原生上传
-  console.log(event.target.files)
-  const files = event.target.files
-  if (files.length !== 0) {
+  if (importFileType.value === 'changeCert') {
+    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) {
+      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,
+          event.target.value = ''
+          const params = {
+            minioFileName: res.data[0],
+            certificatePrintId: changeCertificateReportId.value,
+          }
+          changeCert(params).then(() => {
+            ElMessage.success('更换证书成功')
+            loading.close()
+          }).catch(() => {
+            ElMessage.warning('文件上传失败')
+            loading.close()
+          })
         }
-        changeCert(params).then(() => {
-          ElMessage.success('更换证书成功')
+        else {
+          ElMessage.error(res.message)
+        }
+      }).catch(() => {
+        ElMessage.warning('文件上传失败')
+        loading.close()
+      })
+    }
+  }
+  else if (importFileType.value === 'batchImport') {
+    if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+      const fd = new FormData()
+      fd.append('file', event.target.files[0])
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      batchImport(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('批量导入成功')
+          fetchData(false)
           loading.close()
-        }).catch(() => {
-          ElMessage.warning('文件上传失败')
-          loading.close()
-        })
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    }).catch(() => {
-      ElMessage.warning('文件上传失败')
-      loading.close()
-    })
+          event.target.value = ''
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
   }
 }
 const upload = () => {
+  importFileType.value = 'changeCert'
   fileRef.value.click()
 }
 // 点击更换证书
@@ -227,6 +258,12 @@
   changeCertificateReportId.value = row.id
   upload()
 }
+
+// 批量导入
+const handleBatchImport = () => {
+  importFileType.value = 'batchImport'
+  fileRef.value.click()
+}
 // -------------------------------------------------------------------------------------------------
 </script>
 
@@ -316,6 +353,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-import" title="证书扫描件批量导入" type="primary" @click="handleBatchImport" />
+      </template>
       <normal-table
         :data="list"
         :total="total"
@@ -343,7 +383,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="180" fixed="right">
+          <el-table-column label="操作" align="center" width="240" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                 size="small"
@@ -356,8 +396,18 @@
               <el-button
                 size="small"
                 link
+                :disabled="!row.certificateReportPdf"
                 type="primary"
-                @click="downloadFile(row)"
+                @click="downloadFile(row, 'scanPdf')"
+              >
+                扫描件下载
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                :disabled="!row.printFileName"
+                @click="downloadFile(row, 'cert')"
               >
                 下载
               </el-button>
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 1207727..4cb6b22 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -11,7 +11,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getPhotoUrl } from '@/api/system/tool'
 import filePreviewDialog from '@/views/business/schedule/certPrint/components/filePreviewDialog.vue'
-import { delCertificate, exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
+import { batchImport, delCertificate, exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -242,6 +242,36 @@
     })
 }
 
+// --------------------------------------文件导入-------------------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('file', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    batchImport(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('批量导入成功')
+        fetchData()
+        loading.close()
+        event.target.value = ''
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+// 批量导入
+const handleBatchImport = () => {
+  fileRef.value.click()
+}
+// ----------------------------------------------------------------------------------------
+
 onMounted(async () => {
   fetchData()
 })
@@ -273,7 +303,8 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <!-- <icon-button icon="icon-import" title="批量导入" type="primary" /> -->
+          <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
+          <icon-button icon="icon-import" title="批量导入" type="primary" @click="handleBatchImport" />
           <!-- <icon-button icon="icon-template" title="模板下载" type="primary" /> -->
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 4f56253..86b1149 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -10,7 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/views/device/receive/receive'
 import useTemplateDownload from '@/utils/useTemplateDownload'
-import { batchImportSubpackageRecord, exportRecordList, getListPage } from '@/api/business/subpackage/record'
+import { batchImportSubpackageRecord, deleteList, exportRecordList, getListPage } from '@/api/business/subpackage/record'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
@@ -179,6 +179,25 @@
   })
 }
 
+// 点击删除
+const del = (row: IList) => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteList({ ids: [row.id] }).then(() => {
+        ElMessage.success('删除成功')
+        fetchData(true)
+      })
+    })
+}
+
 // -------------------------------------模板下载、批量导入-----------------------------------
 // 模板下载
 const templateDownload = () => {
@@ -272,7 +291,7 @@
               label="操作"
               align="center"
               fixed="right"
-              :width="90"
+              :width="110"
             >
               <template #default="{ row }">
                 <el-button
@@ -283,6 +302,14 @@
                 >
                   详情
                 </el-button>
+                <el-button
+                  size="small"
+                  type="danger"
+                  link
+                  @click="del(row)"
+                >
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 824f0f8..f047365 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -31,6 +31,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const measureWayList = ref<dictType[]>([]) // 检测方式
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const userList = ref<any[]>([]) // 人员列表
 const ABCList = ref<dictType[]>([]) // ABC
@@ -67,6 +68,7 @@
 
   busPersonId: '', 	// 业务员id
   busPersonName: '', 	// 业务员名字
+  sampleBelong: '1', // 样品属性
 })// 表单
 const ruleFormRef = ref<FormInstance>()
 
@@ -98,6 +100,7 @@
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
   // busPersonId: [{ required: true, message: '业务员必填', trigger: 'change' }],
   // powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
+  sampleBelong: [{ required: true, message: '样品属性必填', trigger: 'change' }],
 }) // 表单验证规则
 
 // 其他关联数据列表
@@ -108,6 +111,10 @@
 
 // 获取字典值
 function getDict() {
+  // 获取样品属性
+  getDictByCode('sampleBelong').then((response) => {
+    sampleBelongList.value = response.data
+  })
   // 校检类别
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
@@ -697,6 +704,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品属性:" prop="sampleBelong">
+                <el-select
+                  v-model="dataForm.sampleBelong"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of sampleBelongList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
@@ -755,7 +774,7 @@
     </detail-block-switch>
 
     <!-- 选择委托方组件 -->
-    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <select-customer v-model:visible="visible" @confirm-checkout="confirmCheckout" @change-visible="changeVisible" />
     <scan-sample-dialog ref="scanSampleRef" title="标签绑定" @confirm="scanOver" />
   </app-container>
 </template>
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 09b103b..3b0dccb 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -62,6 +62,8 @@
 
   busPersonId: string // 业务员id
   busPersonName: string // 业务员名字
+
+  sampleBelong?: string // 样品属性
 }
 
 // 检定记录

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 32b5cd5..9b1c4a9 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -78,3 +78,12 @@
     },
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/certificatePrint/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 9e3ce0a..fc72918 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -57,3 +57,12 @@
     data,
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/outsourceCertificate/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index bf4fb0e..88b318e 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -95,3 +95,11 @@
   })
 }
 
+// 列表-分包档案删除
+export function deleteList(data: { ids: string[] }) {
+  return request({
+    url: '/business/outsourcer/batchDelete',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index e792799..93f007a 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -11,7 +11,7 @@
 import { download } from '@/utils/download'
 import { UploadFile } from '@/api/measure/file'
 
-import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
+import { batchImport, certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
@@ -132,16 +132,22 @@
 }
 
 // 点击下载
-const downloadFile = (row: any) => {
-  if (row.printFileName) {
+const downloadFile = (row: any, type: 'cert' | 'scanPdf') => {
+  let fileUrl = ''
+  let fileName = ''
+  if (type === 'cert' && row.printFileName) { fileUrl = row.printFileName }
+  if (type === 'scanPdf' && row.certificateReportPdf) { fileUrl = row.certificateReportPdf }
+  if (fileUrl) {
     const loading = ElLoading.service({
       lock: true,
       text: '下载中，请稍后...',
       background: 'rgba(255, 255, 255, 0.6)',
     })
-    getPhotoUrl(row.printFileName).then((res) => {
+    getPhotoUrl(fileUrl).then((res) => {
       const fileType = res.data.split('.')[res.data.split('.').length - 1]
-      download(res.data, `${row.certificateName}.${fileType}` as string)
+      if (type === 'cert') { fileName = `${row.certificateName}.${fileType}` }
+      if (type === 'scanPdf') { fileName = row.certificateReportPdf }
+      download(res.data, fileName)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
@@ -178,48 +184,73 @@
 
 // -----------------------------------------更换证书-------------------------------------------
 const fileRef = ref() // 文件上传input
+const importFileType = ref('changeCert')
 const changeCertificateReportId = ref('')
 const onFileChange = (event: any) => {
   // 原生上传
-  console.log(event.target.files)
-  const files = event.target.files
-  if (files.length !== 0) {
+  if (importFileType.value === 'changeCert') {
+    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) {
+      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,
+          event.target.value = ''
+          const params = {
+            minioFileName: res.data[0],
+            certificatePrintId: changeCertificateReportId.value,
+          }
+          changeCert(params).then(() => {
+            ElMessage.success('更换证书成功')
+            loading.close()
+          }).catch(() => {
+            ElMessage.warning('文件上传失败')
+            loading.close()
+          })
         }
-        changeCert(params).then(() => {
-          ElMessage.success('更换证书成功')
+        else {
+          ElMessage.error(res.message)
+        }
+      }).catch(() => {
+        ElMessage.warning('文件上传失败')
+        loading.close()
+      })
+    }
+  }
+  else if (importFileType.value === 'batchImport') {
+    if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+      const fd = new FormData()
+      fd.append('file', event.target.files[0])
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      batchImport(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('批量导入成功')
+          fetchData(false)
           loading.close()
-        }).catch(() => {
-          ElMessage.warning('文件上传失败')
-          loading.close()
-        })
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    }).catch(() => {
-      ElMessage.warning('文件上传失败')
-      loading.close()
-    })
+          event.target.value = ''
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
   }
 }
 const upload = () => {
+  importFileType.value = 'changeCert'
   fileRef.value.click()
 }
 // 点击更换证书
@@ -227,6 +258,12 @@
   changeCertificateReportId.value = row.id
   upload()
 }
+
+// 批量导入
+const handleBatchImport = () => {
+  importFileType.value = 'batchImport'
+  fileRef.value.click()
+}
 // -------------------------------------------------------------------------------------------------
 </script>
 
@@ -316,6 +353,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-import" title="证书扫描件批量导入" type="primary" @click="handleBatchImport" />
+      </template>
       <normal-table
         :data="list"
         :total="total"
@@ -343,7 +383,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="180" fixed="right">
+          <el-table-column label="操作" align="center" width="240" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                 size="small"
@@ -356,8 +396,18 @@
               <el-button
                 size="small"
                 link
+                :disabled="!row.certificateReportPdf"
                 type="primary"
-                @click="downloadFile(row)"
+                @click="downloadFile(row, 'scanPdf')"
+              >
+                扫描件下载
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                :disabled="!row.printFileName"
+                @click="downloadFile(row, 'cert')"
               >
                 下载
               </el-button>
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 1207727..4cb6b22 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -11,7 +11,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getPhotoUrl } from '@/api/system/tool'
 import filePreviewDialog from '@/views/business/schedule/certPrint/components/filePreviewDialog.vue'
-import { delCertificate, exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
+import { batchImport, delCertificate, exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -242,6 +242,36 @@
     })
 }
 
+// --------------------------------------文件导入-------------------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('file', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    batchImport(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('批量导入成功')
+        fetchData()
+        loading.close()
+        event.target.value = ''
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+// 批量导入
+const handleBatchImport = () => {
+  fileRef.value.click()
+}
+// ----------------------------------------------------------------------------------------
+
 onMounted(async () => {
   fetchData()
 })
@@ -273,7 +303,8 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <!-- <icon-button icon="icon-import" title="批量导入" type="primary" /> -->
+          <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
+          <icon-button icon="icon-import" title="批量导入" type="primary" @click="handleBatchImport" />
           <!-- <icon-button icon="icon-template" title="模板下载" type="primary" /> -->
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 4f56253..86b1149 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -10,7 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/views/device/receive/receive'
 import useTemplateDownload from '@/utils/useTemplateDownload'
-import { batchImportSubpackageRecord, exportRecordList, getListPage } from '@/api/business/subpackage/record'
+import { batchImportSubpackageRecord, deleteList, exportRecordList, getListPage } from '@/api/business/subpackage/record'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
@@ -179,6 +179,25 @@
   })
 }
 
+// 点击删除
+const del = (row: IList) => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteList({ ids: [row.id] }).then(() => {
+        ElMessage.success('删除成功')
+        fetchData(true)
+      })
+    })
+}
+
 // -------------------------------------模板下载、批量导入-----------------------------------
 // 模板下载
 const templateDownload = () => {
@@ -272,7 +291,7 @@
               label="操作"
               align="center"
               fixed="right"
-              :width="90"
+              :width="110"
             >
               <template #default="{ row }">
                 <el-button
@@ -283,6 +302,14 @@
                 >
                   详情
                 </el-button>
+                <el-button
+                  size="small"
+                  type="danger"
+                  link
+                  @click="del(row)"
+                >
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 824f0f8..f047365 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -31,6 +31,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const measureWayList = ref<dictType[]>([]) // 检测方式
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const userList = ref<any[]>([]) // 人员列表
 const ABCList = ref<dictType[]>([]) // ABC
@@ -67,6 +68,7 @@
 
   busPersonId: '', 	// 业务员id
   busPersonName: '', 	// 业务员名字
+  sampleBelong: '1', // 样品属性
 })// 表单
 const ruleFormRef = ref<FormInstance>()
 
@@ -98,6 +100,7 @@
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
   // busPersonId: [{ required: true, message: '业务员必填', trigger: 'change' }],
   // powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
+  sampleBelong: [{ required: true, message: '样品属性必填', trigger: 'change' }],
 }) // 表单验证规则
 
 // 其他关联数据列表
@@ -108,6 +111,10 @@
 
 // 获取字典值
 function getDict() {
+  // 获取样品属性
+  getDictByCode('sampleBelong').then((response) => {
+    sampleBelongList.value = response.data
+  })
   // 校检类别
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
@@ -697,6 +704,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品属性:" prop="sampleBelong">
+                <el-select
+                  v-model="dataForm.sampleBelong"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of sampleBelongList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
@@ -755,7 +774,7 @@
     </detail-block-switch>
 
     <!-- 选择委托方组件 -->
-    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <select-customer v-model:visible="visible" @confirm-checkout="confirmCheckout" @change-visible="changeVisible" />
     <scan-sample-dialog ref="scanSampleRef" title="标签绑定" @confirm="scanOver" />
   </app-container>
 </template>
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 09b103b..3b0dccb 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -62,6 +62,8 @@
 
   busPersonId: string // 业务员id
   busPersonName: string // 业务员名字
+
+  sampleBelong?: string // 样品属性
 }
 
 // 检定记录
diff --git a/src/views/system/tool/certTempate/list.vue b/src/views/system/tool/certTempate/list.vue
index 350c8a8..b732767 100644
--- a/src/views/system/tool/certTempate/list.vue
+++ b/src/views/system/tool/certTempate/list.vue
@@ -14,6 +14,7 @@
   templateNo: '', // 编号
   templateName: '', // 名称
   templateCreator: '', // 负责人
+  templateDesc: '', // 模板描述
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -124,6 +125,7 @@
   searchQuery.templateCreator = ''
   searchQuery.templateName = ''
   searchQuery.templateNo = ''
+  searchQuery.templateDesc = ''
   getList()
 }
 
@@ -209,6 +211,9 @@
         <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
+        <el-input v-model="searchQuery.templateDesc" placeholder="模板描述" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
         <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 32b5cd5..9b1c4a9 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -78,3 +78,12 @@
     },
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/certificatePrint/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/certificate.ts b/src/api/business/subpackage/certificate.ts
index 9e3ce0a..fc72918 100644
--- a/src/api/business/subpackage/certificate.ts
+++ b/src/api/business/subpackage/certificate.ts
@@ -57,3 +57,12 @@
     data,
   })
 }
+
+// 批量导入
+export function batchImport(data: FormData) {
+  return request({
+    url: '/business/outsourceCertificate/batchImport',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts
index bf4fb0e..88b318e 100644
--- a/src/api/business/subpackage/record.ts
+++ b/src/api/business/subpackage/record.ts
@@ -95,3 +95,11 @@
   })
 }
 
+// 列表-分包档案删除
+export function deleteList(data: { ids: string[] }) {
+  return request({
+    url: '/business/outsourcer/batchDelete',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/business/lab/certificateReportRetrieval/reportList.vue b/src/views/business/lab/certificateReportRetrieval/reportList.vue
index e792799..93f007a 100644
--- a/src/views/business/lab/certificateReportRetrieval/reportList.vue
+++ b/src/views/business/lab/certificateReportRetrieval/reportList.vue
@@ -11,7 +11,7 @@
 import { download } from '@/utils/download'
 import { UploadFile } from '@/api/measure/file'
 
-import { certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
+import { batchImport, certificatePrintDetail, certificatePrintInvalid } from '@/api/business/lab/cert'
 import { getUserList } from '@/api/system/user'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
@@ -132,16 +132,22 @@
 }
 
 // 点击下载
-const downloadFile = (row: any) => {
-  if (row.printFileName) {
+const downloadFile = (row: any, type: 'cert' | 'scanPdf') => {
+  let fileUrl = ''
+  let fileName = ''
+  if (type === 'cert' && row.printFileName) { fileUrl = row.printFileName }
+  if (type === 'scanPdf' && row.certificateReportPdf) { fileUrl = row.certificateReportPdf }
+  if (fileUrl) {
     const loading = ElLoading.service({
       lock: true,
       text: '下载中，请稍后...',
       background: 'rgba(255, 255, 255, 0.6)',
     })
-    getPhotoUrl(row.printFileName).then((res) => {
+    getPhotoUrl(fileUrl).then((res) => {
       const fileType = res.data.split('.')[res.data.split('.').length - 1]
-      download(res.data, `${row.certificateName}.${fileType}` as string)
+      if (type === 'cert') { fileName = `${row.certificateName}.${fileType}` }
+      if (type === 'scanPdf') { fileName = row.certificateReportPdf }
+      download(res.data, fileName)
       loading.close()
     }).catch(() => {
       ElMessage.error('下载失败')
@@ -178,48 +184,73 @@
 
 // -----------------------------------------更换证书-------------------------------------------
 const fileRef = ref() // 文件上传input
+const importFileType = ref('changeCert')
 const changeCertificateReportId = ref('')
 const onFileChange = (event: any) => {
   // 原生上传
-  console.log(event.target.files)
-  const files = event.target.files
-  if (files.length !== 0) {
+  if (importFileType.value === 'changeCert') {
+    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) {
+      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,
+          event.target.value = ''
+          const params = {
+            minioFileName: res.data[0],
+            certificatePrintId: changeCertificateReportId.value,
+          }
+          changeCert(params).then(() => {
+            ElMessage.success('更换证书成功')
+            loading.close()
+          }).catch(() => {
+            ElMessage.warning('文件上传失败')
+            loading.close()
+          })
         }
-        changeCert(params).then(() => {
-          ElMessage.success('更换证书成功')
+        else {
+          ElMessage.error(res.message)
+        }
+      }).catch(() => {
+        ElMessage.warning('文件上传失败')
+        loading.close()
+      })
+    }
+  }
+  else if (importFileType.value === 'batchImport') {
+    if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+      const fd = new FormData()
+      fd.append('file', event.target.files[0])
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      batchImport(fd).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('批量导入成功')
+          fetchData(false)
           loading.close()
-        }).catch(() => {
-          ElMessage.warning('文件上传失败')
-          loading.close()
-        })
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    }).catch(() => {
-      ElMessage.warning('文件上传失败')
-      loading.close()
-    })
+          event.target.value = ''
+        }
+        else {
+          ElMessage.error(res.message)
+        }
+      })
+    }
   }
 }
 const upload = () => {
+  importFileType.value = 'changeCert'
   fileRef.value.click()
 }
 // 点击更换证书
@@ -227,6 +258,12 @@
   changeCertificateReportId.value = row.id
   upload()
 }
+
+// 批量导入
+const handleBatchImport = () => {
+  importFileType.value = 'batchImport'
+  fileRef.value.click()
+}
 // -------------------------------------------------------------------------------------------------
 </script>
 
@@ -316,6 +353,9 @@
       </search-item>
     </search-area>
     <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-import" title="证书扫描件批量导入" type="primary" @click="handleBatchImport" />
+      </template>
       <normal-table
         :data="list"
         :total="total"
@@ -343,7 +383,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="180" fixed="right">
+          <el-table-column label="操作" align="center" width="240" fixed="right">
             <template #default="{ row }">
               <!-- <el-button
                 size="small"
@@ -356,8 +396,18 @@
               <el-button
                 size="small"
                 link
+                :disabled="!row.certificateReportPdf"
                 type="primary"
-                @click="downloadFile(row)"
+                @click="downloadFile(row, 'scanPdf')"
+              >
+                扫描件下载
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                :disabled="!row.printFileName"
+                @click="downloadFile(row, 'cert')"
               >
                 下载
               </el-button>
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index 1207727..4cb6b22 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -11,7 +11,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { getPhotoUrl } from '@/api/system/tool'
 import filePreviewDialog from '@/views/business/schedule/certPrint/components/filePreviewDialog.vue'
-import { delCertificate, exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
+import { batchImport, delCertificate, exportcertificateList, getcertificateList } from '@/api/business/subpackage/certificate'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -242,6 +242,36 @@
     })
 }
 
+// --------------------------------------文件导入-------------------------------------------------
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('file', event.target.files[0])
+    const loading = ElLoading.service({
+      lock: true,
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    batchImport(fd).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success('批量导入成功')
+        fetchData()
+        loading.close()
+        event.target.value = ''
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+// 批量导入
+const handleBatchImport = () => {
+  fileRef.value.click()
+}
+// ----------------------------------------------------------------------------------------
+
 onMounted(async () => {
   fetchData()
 })
@@ -273,7 +303,8 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <!-- <icon-button icon="icon-import" title="批量导入" type="primary" /> -->
+          <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
+          <icon-button icon="icon-import" title="批量导入" type="primary" @click="handleBatchImport" />
           <!-- <icon-button icon="icon-template" title="模板下载" type="primary" /> -->
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue
index 4f56253..86b1149 100644
--- a/src/views/business/subpackage/record/list.vue
+++ b/src/views/business/subpackage/record/list.vue
@@ -10,7 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/views/device/receive/receive'
 import useTemplateDownload from '@/utils/useTemplateDownload'
-import { batchImportSubpackageRecord, exportRecordList, getListPage } from '@/api/business/subpackage/record'
+import { batchImportSubpackageRecord, deleteList, exportRecordList, getListPage } from '@/api/business/subpackage/record'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { keepSearchParams, renewSearchParams } from '@/utils/keepQuery'
 const { proxy } = getCurrentInstance() as any
@@ -179,6 +179,25 @@
   })
 }
 
+// 点击删除
+const del = (row: IList) => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteList({ ids: [row.id] }).then(() => {
+        ElMessage.success('删除成功')
+        fetchData(true)
+      })
+    })
+}
+
 // -------------------------------------模板下载、批量导入-----------------------------------
 // 模板下载
 const templateDownload = () => {
@@ -272,7 +291,7 @@
               label="操作"
               align="center"
               fixed="right"
-              :width="90"
+              :width="110"
             >
               <template #default="{ row }">
                 <el-button
@@ -283,6 +302,14 @@
                 >
                   详情
                 </el-button>
+                <el-button
+                  size="small"
+                  type="danger"
+                  link
+                  @click="del(row)"
+                >
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </template>
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 824f0f8..f047365 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -31,6 +31,7 @@
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const measureTypeList = ref<dictType[]>([]) // 检定方式
 const measureWayList = ref<dictType[]>([]) // 检测方式
+const sampleBelongList = ref<dictType[]>([]) // 样品属性列表
 const powerVoltageList = ref<dictType[]>([]) // 电源电压
 const userList = ref<any[]>([]) // 人员列表
 const ABCList = ref<dictType[]>([]) // ABC
@@ -67,6 +68,7 @@
 
   busPersonId: '', 	// 业务员id
   busPersonName: '', 	// 业务员名字
+  sampleBelong: '1', // 样品属性
 })// 表单
 const ruleFormRef = ref<FormInstance>()
 
@@ -98,6 +100,7 @@
   measurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
   // busPersonId: [{ required: true, message: '业务员必填', trigger: 'change' }],
   // powerVoltage: [{ required: true, message: '电源电压必填', trigger: 'change' }],
+  sampleBelong: [{ required: true, message: '样品属性必填', trigger: 'change' }],
 }) // 表单验证规则
 
 // 其他关联数据列表
@@ -108,6 +111,10 @@
 
 // 获取字典值
 function getDict() {
+  // 获取样品属性
+  getDictByCode('sampleBelong').then((response) => {
+    sampleBelongList.value = response.data
+  })
   // 校检类别
   getDictByCode('measureCategory').then((response) => {
     mesureCategoryList.value = response.data
@@ -697,6 +704,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品属性:" prop="sampleBelong">
+                <el-select
+                  v-model="dataForm.sampleBelong"
+                  :placeholder="pageType === 'detail' ? ' ' : '请选择'"
+                  :disabled="pageType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of sampleBelongList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
@@ -755,7 +774,7 @@
     </detail-block-switch>
 
     <!-- 选择委托方组件 -->
-    <select-customer v-model:visible="visible" @confirmCheckout="confirmCheckout" @changeVisible="changeVisible" />
+    <select-customer v-model:visible="visible" @confirm-checkout="confirmCheckout" @change-visible="changeVisible" />
     <scan-sample-dialog ref="scanSampleRef" title="标签绑定" @confirm="scanOver" />
   </app-container>
 </template>
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 09b103b..3b0dccb 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -62,6 +62,8 @@
 
   busPersonId: string // 业务员id
   busPersonName: string // 业务员名字
+
+  sampleBelong?: string // 样品属性
 }
 
 // 检定记录
diff --git a/src/views/system/tool/certTempate/list.vue b/src/views/system/tool/certTempate/list.vue
index 350c8a8..b732767 100644
--- a/src/views/system/tool/certTempate/list.vue
+++ b/src/views/system/tool/certTempate/list.vue
@@ -14,6 +14,7 @@
   templateNo: '', // 编号
   templateName: '', // 名称
   templateCreator: '', // 负责人
+  templateDesc: '', // 模板描述
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -124,6 +125,7 @@
   searchQuery.templateCreator = ''
   searchQuery.templateName = ''
   searchQuery.templateNo = ''
+  searchQuery.templateDesc = ''
   getList()
 }
 
@@ -209,6 +211,9 @@
         <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
+        <el-input v-model="searchQuery.templateDesc" placeholder="模板描述" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
         <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
diff --git a/src/views/system/tool/fileTemplate/list.vue b/src/views/system/tool/fileTemplate/list.vue
index a7a6290..359523d 100644
--- a/src/views/system/tool/fileTemplate/list.vue
+++ b/src/views/system/tool/fileTemplate/list.vue
@@ -14,6 +14,7 @@
   templateNo: '', // 编号
   templateName: '', // 名称
   templateCreator: '', // 负责人
+  templateDesc: '', // 模板描述
   createStartTime: '',
   createEndTime: '',
   limit: 20,
@@ -122,6 +123,7 @@
   searchQuery.templateCreator = ''
   searchQuery.templateName = ''
   searchQuery.templateNo = ''
+  searchQuery.templateDesc = ''
   getList()
 }
 
@@ -207,6 +209,9 @@
         <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>
+        <el-input v-model="searchQuery.templateDesc" placeholder="模板描述" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
         <el-input v-model="searchQuery.templateCreator" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
       </search-item>
       <search-item>