diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
index 1cba55f..2f2e039 100644
--- a/src/views/business/lab/components/selectPrimitiveLogList.vue
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -29,7 +29,7 @@
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   offset: 1, // 当前页
-  limit: 5, // 每页多少条
+  limit: 20, // 每页多少条
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,7 +107,7 @@
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     offset: 1, // 当前页
-    limit: 5, // 每页多少条
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
@@ -212,7 +212,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
index 1cba55f..2f2e039 100644
--- a/src/views/business/lab/components/selectPrimitiveLogList.vue
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -29,7 +29,7 @@
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   offset: 1, // 当前页
-  limit: 5, // 每页多少条
+  limit: 20, // 每页多少条
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,7 +107,7 @@
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     offset: 1, // 当前页
-    limit: 5, // 每页多少条
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
@@ -212,7 +212,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 2eb7f48..97f94cc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -35,7 +35,7 @@
   sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -100,7 +100,7 @@
     sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -171,7 +171,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
index 1cba55f..2f2e039 100644
--- a/src/views/business/lab/components/selectPrimitiveLogList.vue
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -29,7 +29,7 @@
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   offset: 1, // 当前页
-  limit: 5, // 每页多少条
+  limit: 20, // 每页多少条
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,7 +107,7 @@
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     offset: 1, // 当前页
-    limit: 5, // 每页多少条
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
@@ -212,7 +212,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 2eb7f48..97f94cc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -35,7 +35,7 @@
   sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -100,7 +100,7 @@
     sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -171,7 +171,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 6409759..3442fb8 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -11,7 +11,7 @@
   // certificationReportCode: string // 证书编号
   // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
-  approvalStatus: string // 审批状态-审批查询用
+  approvalStatus: string | null // 审批状态-审批查询用
   orderId: string // 委托书id
   formId: string // 审批用formId
   reason: string // 操作原因
@@ -53,6 +53,46 @@
   status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
 }
 
+// 证书详情副本
+export interface ICertDetail {
+  approvalStatus: string //
+  certificateReportCategory: string // 证书类别，多个逗号分割（字典code），检测报告等
+  certificateReportCode: string // 证书报告编号
+  certificateReportFile: string //
+  certificateReportName: string // 证书报告名称
+  certificateReportType: string // 证书类型，样品内部校验证书等
+  createTime: string //
+  createUser: string | number //
+  customerAddress: string //
+  customerEmail: string //
+  customerName: string //
+  customerNo: string //
+  customerPhone: string //
+  deliverer: string //
+  delivererId: string //
+  delivererTel: string //
+  id: string | number // 证书打印id
+  isDel: boolean //
+  measureContent: string // 检验项目
+  measureDeptId: string | number //
+  measurePersonId: string | number //
+  measureType: string // 校检类别
+  orderId: string | number //
+  originalRecordId: string | number // 原始记录id
+  originalRecordName: string // 原始记录名称
+  planDeliverTime: string //
+  printNum: string | number //
+  printStatus: string //
+  processId: string // 流程实例id
+  remark: string //
+  requireOverTime: string //
+  sampleId: string | number // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  signId: string // 电子签章id
+  templateId: string | number // 证书报告模板id
+}
+
 // 证书详情
 export interface ICertification {
   certificationId: string // 证书id

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
index 1cba55f..2f2e039 100644
--- a/src/views/business/lab/components/selectPrimitiveLogList.vue
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -29,7 +29,7 @@
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   offset: 1, // 当前页
-  limit: 5, // 每页多少条
+  limit: 20, // 每页多少条
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,7 +107,7 @@
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     offset: 1, // 当前页
-    limit: 5, // 每页多少条
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
@@ -212,7 +212,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 2eb7f48..97f94cc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -35,7 +35,7 @@
   sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -100,7 +100,7 @@
     sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -171,7 +171,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 6409759..3442fb8 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -11,7 +11,7 @@
   // certificationReportCode: string // 证书编号
   // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
-  approvalStatus: string // 审批状态-审批查询用
+  approvalStatus: string | null // 审批状态-审批查询用
   orderId: string // 委托书id
   formId: string // 审批用formId
   reason: string // 操作原因
@@ -53,6 +53,46 @@
   status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
 }
 
+// 证书详情副本
+export interface ICertDetail {
+  approvalStatus: string //
+  certificateReportCategory: string // 证书类别，多个逗号分割（字典code），检测报告等
+  certificateReportCode: string // 证书报告编号
+  certificateReportFile: string //
+  certificateReportName: string // 证书报告名称
+  certificateReportType: string // 证书类型，样品内部校验证书等
+  createTime: string //
+  createUser: string | number //
+  customerAddress: string //
+  customerEmail: string //
+  customerName: string //
+  customerNo: string //
+  customerPhone: string //
+  deliverer: string //
+  delivererId: string //
+  delivererTel: string //
+  id: string | number // 证书打印id
+  isDel: boolean //
+  measureContent: string // 检验项目
+  measureDeptId: string | number //
+  measurePersonId: string | number //
+  measureType: string // 校检类别
+  orderId: string | number //
+  originalRecordId: string | number // 原始记录id
+  originalRecordName: string // 原始记录名称
+  planDeliverTime: string //
+  printNum: string | number //
+  printStatus: string //
+  processId: string // 流程实例id
+  remark: string //
+  requireOverTime: string //
+  sampleId: string | number // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  signId: string // 电子签章id
+  templateId: string | number // 证书报告模板id
+}
+
 // 证书详情
 export interface ICertification {
   certificationId: string // 证书id
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 094078a..ffe7412 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -270,6 +270,31 @@
 const printCert = () => {
 
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -578,6 +603,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
index 1cba55f..2f2e039 100644
--- a/src/views/business/lab/components/selectPrimitiveLogList.vue
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -29,7 +29,7 @@
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   offset: 1, // 当前页
-  limit: 5, // 每页多少条
+  limit: 20, // 每页多少条
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,7 +107,7 @@
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     offset: 1, // 当前页
-    limit: 5, // 每页多少条
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
@@ -212,7 +212,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 2eb7f48..97f94cc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -35,7 +35,7 @@
   sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -100,7 +100,7 @@
     sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -171,7 +171,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 6409759..3442fb8 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -11,7 +11,7 @@
   // certificationReportCode: string // 证书编号
   // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
-  approvalStatus: string // 审批状态-审批查询用
+  approvalStatus: string | null // 审批状态-审批查询用
   orderId: string // 委托书id
   formId: string // 审批用formId
   reason: string // 操作原因
@@ -53,6 +53,46 @@
   status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
 }
 
+// 证书详情副本
+export interface ICertDetail {
+  approvalStatus: string //
+  certificateReportCategory: string // 证书类别，多个逗号分割（字典code），检测报告等
+  certificateReportCode: string // 证书报告编号
+  certificateReportFile: string //
+  certificateReportName: string // 证书报告名称
+  certificateReportType: string // 证书类型，样品内部校验证书等
+  createTime: string //
+  createUser: string | number //
+  customerAddress: string //
+  customerEmail: string //
+  customerName: string //
+  customerNo: string //
+  customerPhone: string //
+  deliverer: string //
+  delivererId: string //
+  delivererTel: string //
+  id: string | number // 证书打印id
+  isDel: boolean //
+  measureContent: string // 检验项目
+  measureDeptId: string | number //
+  measurePersonId: string | number //
+  measureType: string // 校检类别
+  orderId: string | number //
+  originalRecordId: string | number // 原始记录id
+  originalRecordName: string // 原始记录名称
+  planDeliverTime: string //
+  printNum: string | number //
+  printStatus: string //
+  processId: string // 流程实例id
+  remark: string //
+  requireOverTime: string //
+  sampleId: string | number // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  signId: string // 电子签章id
+  templateId: string | number // 证书报告模板id
+}
+
 // 证书详情
 export interface ICertification {
   certificationId: string // 证书id
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 094078a..ffe7412 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -270,6 +270,31 @@
 const printCert = () => {
 
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -578,6 +603,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 35ae777..173b7ea 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -32,7 +32,7 @@
   sampleName: '', // 样品名称
   certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
-  approvalStatus: '', // 审批状态-审批查询用
+  approvalStatus: active.value, // 审批状态-审批查询用
   orderId: '', // 委托书id
   reason: '', // 操作原因
   sampleId: '', // 样品id
@@ -81,6 +81,12 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('certPrintActive')) {
+      active.value = window.sessionStorage.getItem('certPrintActive') as string
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
+    }
   })
 }
 
@@ -114,12 +120,12 @@
   const value = menu.value.find(item => item.name === activeTitle.value)!.id as string
   if (StatuFlag) {
     listQuery.value.printStatus = value as string
-    listQuery.value.approvalStatus = 'null'
+    listQuery.value.approvalStatus = null
   }
-  else {
-    listQuery.value.printStatus = ''
-    listQuery.value.approvalStatus = value as string == '0' ? 'null' : value as string
-  }
+  // else {
+  //   listQuery.value.printStatus = ''
+  //   listQuery.value.approvalStatus = value as string == '0' ? null : value as string
+  // }
 }
 
 // 数据查询
@@ -159,7 +165,7 @@
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: '', // 审批状态-审批查询用
+    approvalStatus: active.value, // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -173,7 +179,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -231,9 +237,6 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  console.log('oooooo')
-  console.log(row)
-
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -244,9 +247,6 @@
         type: 'warning',
       },
     ).then(() => {
-      console.log('-----------')
-
-      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
@@ -314,12 +314,6 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('certPrintActive') != null) {
-    active.value = window.sessionStorage.getItem('certPrintActive') as string
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
-  }
   fetchData(true)
 })
 </script>

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
index 1cba55f..2f2e039 100644
--- a/src/views/business/lab/components/selectPrimitiveLogList.vue
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -29,7 +29,7 @@
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   offset: 1, // 当前页
-  limit: 5, // 每页多少条
+  limit: 20, // 每页多少条
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,7 +107,7 @@
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     offset: 1, // 当前页
-    limit: 5, // 每页多少条
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
@@ -212,7 +212,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 2eb7f48..97f94cc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -35,7 +35,7 @@
   sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -100,7 +100,7 @@
     sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -171,7 +171,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 6409759..3442fb8 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -11,7 +11,7 @@
   // certificationReportCode: string // 证书编号
   // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
-  approvalStatus: string // 审批状态-审批查询用
+  approvalStatus: string | null // 审批状态-审批查询用
   orderId: string // 委托书id
   formId: string // 审批用formId
   reason: string // 操作原因
@@ -53,6 +53,46 @@
   status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
 }
 
+// 证书详情副本
+export interface ICertDetail {
+  approvalStatus: string //
+  certificateReportCategory: string // 证书类别，多个逗号分割（字典code），检测报告等
+  certificateReportCode: string // 证书报告编号
+  certificateReportFile: string //
+  certificateReportName: string // 证书报告名称
+  certificateReportType: string // 证书类型，样品内部校验证书等
+  createTime: string //
+  createUser: string | number //
+  customerAddress: string //
+  customerEmail: string //
+  customerName: string //
+  customerNo: string //
+  customerPhone: string //
+  deliverer: string //
+  delivererId: string //
+  delivererTel: string //
+  id: string | number // 证书打印id
+  isDel: boolean //
+  measureContent: string // 检验项目
+  measureDeptId: string | number //
+  measurePersonId: string | number //
+  measureType: string // 校检类别
+  orderId: string | number //
+  originalRecordId: string | number // 原始记录id
+  originalRecordName: string // 原始记录名称
+  planDeliverTime: string //
+  printNum: string | number //
+  printStatus: string //
+  processId: string // 流程实例id
+  remark: string //
+  requireOverTime: string //
+  sampleId: string | number // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  signId: string // 电子签章id
+  templateId: string | number // 证书报告模板id
+}
+
 // 证书详情
 export interface ICertification {
   certificationId: string // 证书id
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 094078a..ffe7412 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -270,6 +270,31 @@
 const printCert = () => {
 
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -578,6 +603,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 35ae777..173b7ea 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -32,7 +32,7 @@
   sampleName: '', // 样品名称
   certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
-  approvalStatus: '', // 审批状态-审批查询用
+  approvalStatus: active.value, // 审批状态-审批查询用
   orderId: '', // 委托书id
   reason: '', // 操作原因
   sampleId: '', // 样品id
@@ -81,6 +81,12 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('certPrintActive')) {
+      active.value = window.sessionStorage.getItem('certPrintActive') as string
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
+    }
   })
 }
 
@@ -114,12 +120,12 @@
   const value = menu.value.find(item => item.name === activeTitle.value)!.id as string
   if (StatuFlag) {
     listQuery.value.printStatus = value as string
-    listQuery.value.approvalStatus = 'null'
+    listQuery.value.approvalStatus = null
   }
-  else {
-    listQuery.value.printStatus = ''
-    listQuery.value.approvalStatus = value as string == '0' ? 'null' : value as string
-  }
+  // else {
+  //   listQuery.value.printStatus = ''
+  //   listQuery.value.approvalStatus = value as string == '0' ? null : value as string
+  // }
 }
 
 // 数据查询
@@ -159,7 +165,7 @@
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: '', // 审批状态-审批查询用
+    approvalStatus: active.value, // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -173,7 +179,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -231,9 +237,6 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  console.log('oooooo')
-  console.log(row)
-
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -244,9 +247,6 @@
         type: 'warning',
       },
     ).then(() => {
-      console.log('-----------')
-
-      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
@@ -314,12 +314,6 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('certPrintActive') != null) {
-    active.value = window.sessionStorage.getItem('certPrintActive') as string
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
-  }
   fetchData(true)
 })
 </script>
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 79a112a..11d3092 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -26,7 +26,7 @@
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -85,7 +85,7 @@
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -156,7 +156,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
index 1cba55f..2f2e039 100644
--- a/src/views/business/lab/components/selectPrimitiveLogList.vue
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -29,7 +29,7 @@
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   offset: 1, // 当前页
-  limit: 5, // 每页多少条
+  limit: 20, // 每页多少条
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,7 +107,7 @@
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     offset: 1, // 当前页
-    limit: 5, // 每页多少条
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
@@ -212,7 +212,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 2eb7f48..97f94cc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -35,7 +35,7 @@
   sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -100,7 +100,7 @@
     sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -171,7 +171,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 6409759..3442fb8 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -11,7 +11,7 @@
   // certificationReportCode: string // 证书编号
   // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
-  approvalStatus: string // 审批状态-审批查询用
+  approvalStatus: string | null // 审批状态-审批查询用
   orderId: string // 委托书id
   formId: string // 审批用formId
   reason: string // 操作原因
@@ -53,6 +53,46 @@
   status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
 }
 
+// 证书详情副本
+export interface ICertDetail {
+  approvalStatus: string //
+  certificateReportCategory: string // 证书类别，多个逗号分割（字典code），检测报告等
+  certificateReportCode: string // 证书报告编号
+  certificateReportFile: string //
+  certificateReportName: string // 证书报告名称
+  certificateReportType: string // 证书类型，样品内部校验证书等
+  createTime: string //
+  createUser: string | number //
+  customerAddress: string //
+  customerEmail: string //
+  customerName: string //
+  customerNo: string //
+  customerPhone: string //
+  deliverer: string //
+  delivererId: string //
+  delivererTel: string //
+  id: string | number // 证书打印id
+  isDel: boolean //
+  measureContent: string // 检验项目
+  measureDeptId: string | number //
+  measurePersonId: string | number //
+  measureType: string // 校检类别
+  orderId: string | number //
+  originalRecordId: string | number // 原始记录id
+  originalRecordName: string // 原始记录名称
+  planDeliverTime: string //
+  printNum: string | number //
+  printStatus: string //
+  processId: string // 流程实例id
+  remark: string //
+  requireOverTime: string //
+  sampleId: string | number // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  signId: string // 电子签章id
+  templateId: string | number // 证书报告模板id
+}
+
 // 证书详情
 export interface ICertification {
   certificationId: string // 证书id
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 094078a..ffe7412 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -270,6 +270,31 @@
 const printCert = () => {
 
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -578,6 +603,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 35ae777..173b7ea 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -32,7 +32,7 @@
   sampleName: '', // 样品名称
   certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
-  approvalStatus: '', // 审批状态-审批查询用
+  approvalStatus: active.value, // 审批状态-审批查询用
   orderId: '', // 委托书id
   reason: '', // 操作原因
   sampleId: '', // 样品id
@@ -81,6 +81,12 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('certPrintActive')) {
+      active.value = window.sessionStorage.getItem('certPrintActive') as string
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
+    }
   })
 }
 
@@ -114,12 +120,12 @@
   const value = menu.value.find(item => item.name === activeTitle.value)!.id as string
   if (StatuFlag) {
     listQuery.value.printStatus = value as string
-    listQuery.value.approvalStatus = 'null'
+    listQuery.value.approvalStatus = null
   }
-  else {
-    listQuery.value.printStatus = ''
-    listQuery.value.approvalStatus = value as string == '0' ? 'null' : value as string
-  }
+  // else {
+  //   listQuery.value.printStatus = ''
+  //   listQuery.value.approvalStatus = value as string == '0' ? null : value as string
+  // }
 }
 
 // 数据查询
@@ -159,7 +165,7 @@
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: '', // 审批状态-审批查询用
+    approvalStatus: active.value, // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -173,7 +179,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -231,9 +237,6 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  console.log('oooooo')
-  console.log(row)
-
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -244,9 +247,6 @@
         type: 'warning',
       },
     ).then(() => {
-      console.log('-----------')
-
-      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
@@ -314,12 +314,6 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('certPrintActive') != null) {
-    active.value = window.sessionStorage.getItem('certPrintActive') as string
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
-  }
   fetchData(true)
 })
 </script>
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 79a112a..11d3092 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -26,7 +26,7 @@
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -85,7 +85,7 @@
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -156,7 +156,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index a343e18..d1e2598 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -30,7 +30,7 @@
   endTime: '', // 检定结束时间
   overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -94,7 +94,7 @@
     endTime: '', // 检定结束时间
     overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -165,7 +165,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       />

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
index 1cba55f..2f2e039 100644
--- a/src/views/business/lab/components/selectPrimitiveLogList.vue
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -29,7 +29,7 @@
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   offset: 1, // 当前页
-  limit: 5, // 每页多少条
+  limit: 20, // 每页多少条
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,7 +107,7 @@
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     offset: 1, // 当前页
-    limit: 5, // 每页多少条
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
@@ -212,7 +212,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 2eb7f48..97f94cc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -35,7 +35,7 @@
   sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -100,7 +100,7 @@
     sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -171,7 +171,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 6409759..3442fb8 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -11,7 +11,7 @@
   // certificationReportCode: string // 证书编号
   // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
-  approvalStatus: string // 审批状态-审批查询用
+  approvalStatus: string | null // 审批状态-审批查询用
   orderId: string // 委托书id
   formId: string // 审批用formId
   reason: string // 操作原因
@@ -53,6 +53,46 @@
   status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
 }
 
+// 证书详情副本
+export interface ICertDetail {
+  approvalStatus: string //
+  certificateReportCategory: string // 证书类别，多个逗号分割（字典code），检测报告等
+  certificateReportCode: string // 证书报告编号
+  certificateReportFile: string //
+  certificateReportName: string // 证书报告名称
+  certificateReportType: string // 证书类型，样品内部校验证书等
+  createTime: string //
+  createUser: string | number //
+  customerAddress: string //
+  customerEmail: string //
+  customerName: string //
+  customerNo: string //
+  customerPhone: string //
+  deliverer: string //
+  delivererId: string //
+  delivererTel: string //
+  id: string | number // 证书打印id
+  isDel: boolean //
+  measureContent: string // 检验项目
+  measureDeptId: string | number //
+  measurePersonId: string | number //
+  measureType: string // 校检类别
+  orderId: string | number //
+  originalRecordId: string | number // 原始记录id
+  originalRecordName: string // 原始记录名称
+  planDeliverTime: string //
+  printNum: string | number //
+  printStatus: string //
+  processId: string // 流程实例id
+  remark: string //
+  requireOverTime: string //
+  sampleId: string | number // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  signId: string // 电子签章id
+  templateId: string | number // 证书报告模板id
+}
+
 // 证书详情
 export interface ICertification {
   certificationId: string // 证书id
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 094078a..ffe7412 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -270,6 +270,31 @@
 const printCert = () => {
 
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -578,6 +603,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 35ae777..173b7ea 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -32,7 +32,7 @@
   sampleName: '', // 样品名称
   certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
-  approvalStatus: '', // 审批状态-审批查询用
+  approvalStatus: active.value, // 审批状态-审批查询用
   orderId: '', // 委托书id
   reason: '', // 操作原因
   sampleId: '', // 样品id
@@ -81,6 +81,12 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('certPrintActive')) {
+      active.value = window.sessionStorage.getItem('certPrintActive') as string
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
+    }
   })
 }
 
@@ -114,12 +120,12 @@
   const value = menu.value.find(item => item.name === activeTitle.value)!.id as string
   if (StatuFlag) {
     listQuery.value.printStatus = value as string
-    listQuery.value.approvalStatus = 'null'
+    listQuery.value.approvalStatus = null
   }
-  else {
-    listQuery.value.printStatus = ''
-    listQuery.value.approvalStatus = value as string == '0' ? 'null' : value as string
-  }
+  // else {
+  //   listQuery.value.printStatus = ''
+  //   listQuery.value.approvalStatus = value as string == '0' ? null : value as string
+  // }
 }
 
 // 数据查询
@@ -159,7 +165,7 @@
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: '', // 审批状态-审批查询用
+    approvalStatus: active.value, // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -173,7 +179,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -231,9 +237,6 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  console.log('oooooo')
-  console.log(row)
-
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -244,9 +247,6 @@
         type: 'warning',
       },
     ).then(() => {
-      console.log('-----------')
-
-      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
@@ -314,12 +314,6 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('certPrintActive') != null) {
-    active.value = window.sessionStorage.getItem('certPrintActive') as string
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
-  }
   fetchData(true)
 })
 </script>
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 79a112a..11d3092 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -26,7 +26,7 @@
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -85,7 +85,7 @@
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -156,7 +156,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index a343e18..d1e2598 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -30,7 +30,7 @@
   endTime: '', // 检定结束时间
   overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -94,7 +94,7 @@
     endTime: '', // 检定结束时间
     overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -165,7 +165,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       />
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 127fa61..5e11e43 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -22,7 +22,7 @@
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
@@ -131,7 +131,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="240"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
index 1cba55f..2f2e039 100644
--- a/src/views/business/lab/components/selectPrimitiveLogList.vue
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -29,7 +29,7 @@
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   offset: 1, // 当前页
-  limit: 5, // 每页多少条
+  limit: 20, // 每页多少条
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,7 +107,7 @@
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     offset: 1, // 当前页
-    limit: 5, // 每页多少条
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
@@ -212,7 +212,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 2eb7f48..97f94cc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -35,7 +35,7 @@
   sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -100,7 +100,7 @@
     sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -171,7 +171,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 6409759..3442fb8 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -11,7 +11,7 @@
   // certificationReportCode: string // 证书编号
   // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
-  approvalStatus: string // 审批状态-审批查询用
+  approvalStatus: string | null // 审批状态-审批查询用
   orderId: string // 委托书id
   formId: string // 审批用formId
   reason: string // 操作原因
@@ -53,6 +53,46 @@
   status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
 }
 
+// 证书详情副本
+export interface ICertDetail {
+  approvalStatus: string //
+  certificateReportCategory: string // 证书类别，多个逗号分割（字典code），检测报告等
+  certificateReportCode: string // 证书报告编号
+  certificateReportFile: string //
+  certificateReportName: string // 证书报告名称
+  certificateReportType: string // 证书类型，样品内部校验证书等
+  createTime: string //
+  createUser: string | number //
+  customerAddress: string //
+  customerEmail: string //
+  customerName: string //
+  customerNo: string //
+  customerPhone: string //
+  deliverer: string //
+  delivererId: string //
+  delivererTel: string //
+  id: string | number // 证书打印id
+  isDel: boolean //
+  measureContent: string // 检验项目
+  measureDeptId: string | number //
+  measurePersonId: string | number //
+  measureType: string // 校检类别
+  orderId: string | number //
+  originalRecordId: string | number // 原始记录id
+  originalRecordName: string // 原始记录名称
+  planDeliverTime: string //
+  printNum: string | number //
+  printStatus: string //
+  processId: string // 流程实例id
+  remark: string //
+  requireOverTime: string //
+  sampleId: string | number // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  signId: string // 电子签章id
+  templateId: string | number // 证书报告模板id
+}
+
 // 证书详情
 export interface ICertification {
   certificationId: string // 证书id
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 094078a..ffe7412 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -270,6 +270,31 @@
 const printCert = () => {
 
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -578,6 +603,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 35ae777..173b7ea 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -32,7 +32,7 @@
   sampleName: '', // 样品名称
   certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
-  approvalStatus: '', // 审批状态-审批查询用
+  approvalStatus: active.value, // 审批状态-审批查询用
   orderId: '', // 委托书id
   reason: '', // 操作原因
   sampleId: '', // 样品id
@@ -81,6 +81,12 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('certPrintActive')) {
+      active.value = window.sessionStorage.getItem('certPrintActive') as string
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
+    }
   })
 }
 
@@ -114,12 +120,12 @@
   const value = menu.value.find(item => item.name === activeTitle.value)!.id as string
   if (StatuFlag) {
     listQuery.value.printStatus = value as string
-    listQuery.value.approvalStatus = 'null'
+    listQuery.value.approvalStatus = null
   }
-  else {
-    listQuery.value.printStatus = ''
-    listQuery.value.approvalStatus = value as string == '0' ? 'null' : value as string
-  }
+  // else {
+  //   listQuery.value.printStatus = ''
+  //   listQuery.value.approvalStatus = value as string == '0' ? null : value as string
+  // }
 }
 
 // 数据查询
@@ -159,7 +165,7 @@
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: '', // 审批状态-审批查询用
+    approvalStatus: active.value, // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -173,7 +179,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -231,9 +237,6 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  console.log('oooooo')
-  console.log(row)
-
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -244,9 +247,6 @@
         type: 'warning',
       },
     ).then(() => {
-      console.log('-----------')
-
-      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
@@ -314,12 +314,6 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('certPrintActive') != null) {
-    active.value = window.sessionStorage.getItem('certPrintActive') as string
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
-  }
   fetchData(true)
 })
 </script>
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 79a112a..11d3092 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -26,7 +26,7 @@
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -85,7 +85,7 @@
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -156,7 +156,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index a343e18..d1e2598 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -30,7 +30,7 @@
   endTime: '', // 检定结束时间
   overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -94,7 +94,7 @@
     endTime: '', // 检定结束时间
     overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -165,7 +165,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       />
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 127fa61..5e11e43 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -22,7 +22,7 @@
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
@@ -131,7 +131,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="240"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 4b0f2c1..10d6a51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -39,6 +39,7 @@
 // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
+  applyUnit: '', // 申请部门
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyType: props.applyType, // 申请类型

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
index 1cba55f..2f2e039 100644
--- a/src/views/business/lab/components/selectPrimitiveLogList.vue
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -29,7 +29,7 @@
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   offset: 1, // 当前页
-  limit: 5, // 每页多少条
+  limit: 20, // 每页多少条
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,7 +107,7 @@
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     offset: 1, // 当前页
-    limit: 5, // 每页多少条
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
@@ -212,7 +212,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 2eb7f48..97f94cc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -35,7 +35,7 @@
   sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -100,7 +100,7 @@
     sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -171,7 +171,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 6409759..3442fb8 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -11,7 +11,7 @@
   // certificationReportCode: string // 证书编号
   // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
-  approvalStatus: string // 审批状态-审批查询用
+  approvalStatus: string | null // 审批状态-审批查询用
   orderId: string // 委托书id
   formId: string // 审批用formId
   reason: string // 操作原因
@@ -53,6 +53,46 @@
   status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
 }
 
+// 证书详情副本
+export interface ICertDetail {
+  approvalStatus: string //
+  certificateReportCategory: string // 证书类别，多个逗号分割（字典code），检测报告等
+  certificateReportCode: string // 证书报告编号
+  certificateReportFile: string //
+  certificateReportName: string // 证书报告名称
+  certificateReportType: string // 证书类型，样品内部校验证书等
+  createTime: string //
+  createUser: string | number //
+  customerAddress: string //
+  customerEmail: string //
+  customerName: string //
+  customerNo: string //
+  customerPhone: string //
+  deliverer: string //
+  delivererId: string //
+  delivererTel: string //
+  id: string | number // 证书打印id
+  isDel: boolean //
+  measureContent: string // 检验项目
+  measureDeptId: string | number //
+  measurePersonId: string | number //
+  measureType: string // 校检类别
+  orderId: string | number //
+  originalRecordId: string | number // 原始记录id
+  originalRecordName: string // 原始记录名称
+  planDeliverTime: string //
+  printNum: string | number //
+  printStatus: string //
+  processId: string // 流程实例id
+  remark: string //
+  requireOverTime: string //
+  sampleId: string | number // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  signId: string // 电子签章id
+  templateId: string | number // 证书报告模板id
+}
+
 // 证书详情
 export interface ICertification {
   certificationId: string // 证书id
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 094078a..ffe7412 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -270,6 +270,31 @@
 const printCert = () => {
 
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -578,6 +603,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 35ae777..173b7ea 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -32,7 +32,7 @@
   sampleName: '', // 样品名称
   certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
-  approvalStatus: '', // 审批状态-审批查询用
+  approvalStatus: active.value, // 审批状态-审批查询用
   orderId: '', // 委托书id
   reason: '', // 操作原因
   sampleId: '', // 样品id
@@ -81,6 +81,12 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('certPrintActive')) {
+      active.value = window.sessionStorage.getItem('certPrintActive') as string
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
+    }
   })
 }
 
@@ -114,12 +120,12 @@
   const value = menu.value.find(item => item.name === activeTitle.value)!.id as string
   if (StatuFlag) {
     listQuery.value.printStatus = value as string
-    listQuery.value.approvalStatus = 'null'
+    listQuery.value.approvalStatus = null
   }
-  else {
-    listQuery.value.printStatus = ''
-    listQuery.value.approvalStatus = value as string == '0' ? 'null' : value as string
-  }
+  // else {
+  //   listQuery.value.printStatus = ''
+  //   listQuery.value.approvalStatus = value as string == '0' ? null : value as string
+  // }
 }
 
 // 数据查询
@@ -159,7 +165,7 @@
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: '', // 审批状态-审批查询用
+    approvalStatus: active.value, // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -173,7 +179,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -231,9 +237,6 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  console.log('oooooo')
-  console.log(row)
-
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -244,9 +247,6 @@
         type: 'warning',
       },
     ).then(() => {
-      console.log('-----------')
-
-      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
@@ -314,12 +314,6 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('certPrintActive') != null) {
-    active.value = window.sessionStorage.getItem('certPrintActive') as string
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
-  }
   fetchData(true)
 })
 </script>
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 79a112a..11d3092 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -26,7 +26,7 @@
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -85,7 +85,7 @@
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -156,7 +156,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index a343e18..d1e2598 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -30,7 +30,7 @@
   endTime: '', // 检定结束时间
   overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -94,7 +94,7 @@
     endTime: '', // 检定结束时间
     overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -165,7 +165,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       />
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 127fa61..5e11e43 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -22,7 +22,7 @@
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
@@ -131,7 +131,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="240"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 4b0f2c1..10d6a51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -39,6 +39,7 @@
 // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
+  applyUnit: '', // 申请部门
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyType: props.applyType, // 申请类型
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index ed415e0..c9f6db1 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -48,6 +48,7 @@
 
 // 查询条件类型
 export interface IlistQuery {
+  applyUnit: string // 申请部门
   applyNo: string // 申请编号
   applyStatus: string // 申请状态
   applyType: string // 申请类型

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
index 1cba55f..2f2e039 100644
--- a/src/views/business/lab/components/selectPrimitiveLogList.vue
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -29,7 +29,7 @@
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   offset: 1, // 当前页
-  limit: 5, // 每页多少条
+  limit: 20, // 每页多少条
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,7 +107,7 @@
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     offset: 1, // 当前页
-    limit: 5, // 每页多少条
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
@@ -212,7 +212,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 2eb7f48..97f94cc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -35,7 +35,7 @@
   sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -100,7 +100,7 @@
     sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -171,7 +171,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 6409759..3442fb8 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -11,7 +11,7 @@
   // certificationReportCode: string // 证书编号
   // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
-  approvalStatus: string // 审批状态-审批查询用
+  approvalStatus: string | null // 审批状态-审批查询用
   orderId: string // 委托书id
   formId: string // 审批用formId
   reason: string // 操作原因
@@ -53,6 +53,46 @@
   status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
 }
 
+// 证书详情副本
+export interface ICertDetail {
+  approvalStatus: string //
+  certificateReportCategory: string // 证书类别，多个逗号分割（字典code），检测报告等
+  certificateReportCode: string // 证书报告编号
+  certificateReportFile: string //
+  certificateReportName: string // 证书报告名称
+  certificateReportType: string // 证书类型，样品内部校验证书等
+  createTime: string //
+  createUser: string | number //
+  customerAddress: string //
+  customerEmail: string //
+  customerName: string //
+  customerNo: string //
+  customerPhone: string //
+  deliverer: string //
+  delivererId: string //
+  delivererTel: string //
+  id: string | number // 证书打印id
+  isDel: boolean //
+  measureContent: string // 检验项目
+  measureDeptId: string | number //
+  measurePersonId: string | number //
+  measureType: string // 校检类别
+  orderId: string | number //
+  originalRecordId: string | number // 原始记录id
+  originalRecordName: string // 原始记录名称
+  planDeliverTime: string //
+  printNum: string | number //
+  printStatus: string //
+  processId: string // 流程实例id
+  remark: string //
+  requireOverTime: string //
+  sampleId: string | number // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  signId: string // 电子签章id
+  templateId: string | number // 证书报告模板id
+}
+
 // 证书详情
 export interface ICertification {
   certificationId: string // 证书id
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 094078a..ffe7412 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -270,6 +270,31 @@
 const printCert = () => {
 
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -578,6 +603,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 35ae777..173b7ea 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -32,7 +32,7 @@
   sampleName: '', // 样品名称
   certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
-  approvalStatus: '', // 审批状态-审批查询用
+  approvalStatus: active.value, // 审批状态-审批查询用
   orderId: '', // 委托书id
   reason: '', // 操作原因
   sampleId: '', // 样品id
@@ -81,6 +81,12 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('certPrintActive')) {
+      active.value = window.sessionStorage.getItem('certPrintActive') as string
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
+    }
   })
 }
 
@@ -114,12 +120,12 @@
   const value = menu.value.find(item => item.name === activeTitle.value)!.id as string
   if (StatuFlag) {
     listQuery.value.printStatus = value as string
-    listQuery.value.approvalStatus = 'null'
+    listQuery.value.approvalStatus = null
   }
-  else {
-    listQuery.value.printStatus = ''
-    listQuery.value.approvalStatus = value as string == '0' ? 'null' : value as string
-  }
+  // else {
+  //   listQuery.value.printStatus = ''
+  //   listQuery.value.approvalStatus = value as string == '0' ? null : value as string
+  // }
 }
 
 // 数据查询
@@ -159,7 +165,7 @@
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: '', // 审批状态-审批查询用
+    approvalStatus: active.value, // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -173,7 +179,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -231,9 +237,6 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  console.log('oooooo')
-  console.log(row)
-
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -244,9 +247,6 @@
         type: 'warning',
       },
     ).then(() => {
-      console.log('-----------')
-
-      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
@@ -314,12 +314,6 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('certPrintActive') != null) {
-    active.value = window.sessionStorage.getItem('certPrintActive') as string
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
-  }
   fetchData(true)
 })
 </script>
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 79a112a..11d3092 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -26,7 +26,7 @@
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -85,7 +85,7 @@
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -156,7 +156,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index a343e18..d1e2598 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -30,7 +30,7 @@
   endTime: '', // 检定结束时间
   overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -94,7 +94,7 @@
     endTime: '', // 检定结束时间
     overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -165,7 +165,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       />
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 127fa61..5e11e43 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -22,7 +22,7 @@
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
@@ -131,7 +131,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="240"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 4b0f2c1..10d6a51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -39,6 +39,7 @@
 // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
+  applyUnit: '', // 申请部门
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyType: props.applyType, // 申请类型
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index ed415e0..c9f6db1 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -48,6 +48,7 @@
 
 // 查询条件类型
 export interface IlistQuery {
+  applyUnit: string // 申请部门
   applyNo: string // 申请编号
   applyStatus: string // 申请状态
   applyType: string // 申请类型
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
index 6d93818..ceb36c0 100644
--- a/src/views/device/stateManage/components/selectDevice.vue
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -11,7 +11,7 @@
 const listQuery = ref({
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
-  limit: 5,
+  limit: 20,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -87,7 +87,7 @@
   listQuery.value = {
     equipmentName: '', // 姓名
     equipmentNo: '', // 所在部门
-    limit: 5,
+    limit: 20,
     offset: 1,
   }
   search()
@@ -148,8 +148,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[20]"
         :list-loading="loadingTable" is-showmulti-select
+        :height="240"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
index 1cba55f..2f2e039 100644
--- a/src/views/business/lab/components/selectPrimitiveLogList.vue
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -29,7 +29,7 @@
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   offset: 1, // 当前页
-  limit: 5, // 每页多少条
+  limit: 20, // 每页多少条
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,7 +107,7 @@
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     offset: 1, // 当前页
-    limit: 5, // 每页多少条
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
@@ -212,7 +212,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 2eb7f48..97f94cc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -35,7 +35,7 @@
   sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -100,7 +100,7 @@
     sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -171,7 +171,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 6409759..3442fb8 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -11,7 +11,7 @@
   // certificationReportCode: string // 证书编号
   // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
-  approvalStatus: string // 审批状态-审批查询用
+  approvalStatus: string | null // 审批状态-审批查询用
   orderId: string // 委托书id
   formId: string // 审批用formId
   reason: string // 操作原因
@@ -53,6 +53,46 @@
   status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
 }
 
+// 证书详情副本
+export interface ICertDetail {
+  approvalStatus: string //
+  certificateReportCategory: string // 证书类别，多个逗号分割（字典code），检测报告等
+  certificateReportCode: string // 证书报告编号
+  certificateReportFile: string //
+  certificateReportName: string // 证书报告名称
+  certificateReportType: string // 证书类型，样品内部校验证书等
+  createTime: string //
+  createUser: string | number //
+  customerAddress: string //
+  customerEmail: string //
+  customerName: string //
+  customerNo: string //
+  customerPhone: string //
+  deliverer: string //
+  delivererId: string //
+  delivererTel: string //
+  id: string | number // 证书打印id
+  isDel: boolean //
+  measureContent: string // 检验项目
+  measureDeptId: string | number //
+  measurePersonId: string | number //
+  measureType: string // 校检类别
+  orderId: string | number //
+  originalRecordId: string | number // 原始记录id
+  originalRecordName: string // 原始记录名称
+  planDeliverTime: string //
+  printNum: string | number //
+  printStatus: string //
+  processId: string // 流程实例id
+  remark: string //
+  requireOverTime: string //
+  sampleId: string | number // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  signId: string // 电子签章id
+  templateId: string | number // 证书报告模板id
+}
+
 // 证书详情
 export interface ICertification {
   certificationId: string // 证书id
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 094078a..ffe7412 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -270,6 +270,31 @@
 const printCert = () => {
 
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -578,6 +603,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 35ae777..173b7ea 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -32,7 +32,7 @@
   sampleName: '', // 样品名称
   certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
-  approvalStatus: '', // 审批状态-审批查询用
+  approvalStatus: active.value, // 审批状态-审批查询用
   orderId: '', // 委托书id
   reason: '', // 操作原因
   sampleId: '', // 样品id
@@ -81,6 +81,12 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('certPrintActive')) {
+      active.value = window.sessionStorage.getItem('certPrintActive') as string
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
+    }
   })
 }
 
@@ -114,12 +120,12 @@
   const value = menu.value.find(item => item.name === activeTitle.value)!.id as string
   if (StatuFlag) {
     listQuery.value.printStatus = value as string
-    listQuery.value.approvalStatus = 'null'
+    listQuery.value.approvalStatus = null
   }
-  else {
-    listQuery.value.printStatus = ''
-    listQuery.value.approvalStatus = value as string == '0' ? 'null' : value as string
-  }
+  // else {
+  //   listQuery.value.printStatus = ''
+  //   listQuery.value.approvalStatus = value as string == '0' ? null : value as string
+  // }
 }
 
 // 数据查询
@@ -159,7 +165,7 @@
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: '', // 审批状态-审批查询用
+    approvalStatus: active.value, // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -173,7 +179,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -231,9 +237,6 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  console.log('oooooo')
-  console.log(row)
-
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -244,9 +247,6 @@
         type: 'warning',
       },
     ).then(() => {
-      console.log('-----------')
-
-      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
@@ -314,12 +314,6 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('certPrintActive') != null) {
-    active.value = window.sessionStorage.getItem('certPrintActive') as string
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
-  }
   fetchData(true)
 })
 </script>
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 79a112a..11d3092 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -26,7 +26,7 @@
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -85,7 +85,7 @@
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -156,7 +156,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index a343e18..d1e2598 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -30,7 +30,7 @@
   endTime: '', // 检定结束时间
   overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -94,7 +94,7 @@
     endTime: '', // 检定结束时间
     overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -165,7 +165,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       />
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 127fa61..5e11e43 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -22,7 +22,7 @@
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
@@ -131,7 +131,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="240"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 4b0f2c1..10d6a51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -39,6 +39,7 @@
 // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
+  applyUnit: '', // 申请部门
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyType: props.applyType, // 申请类型
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index ed415e0..c9f6db1 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -48,6 +48,7 @@
 
 // 查询条件类型
 export interface IlistQuery {
+  applyUnit: string // 申请部门
   applyNo: string // 申请编号
   applyStatus: string // 申请状态
   applyType: string // 申请类型
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
index 6d93818..ceb36c0 100644
--- a/src/views/device/stateManage/components/selectDevice.vue
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -11,7 +11,7 @@
 const listQuery = ref({
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
-  limit: 5,
+  limit: 20,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -87,7 +87,7 @@
   listQuery.value = {
     equipmentName: '', // 姓名
     equipmentNo: '', // 所在部门
-    limit: 5,
+    limit: 20,
     offset: 1,
   }
   search()
@@ -148,8 +148,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[20]"
         :list-loading="loadingTable" is-showmulti-select
+        :height="240"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/device/stateManage/components/selectDeviceDialog.vue b/src/views/device/stateManage/components/selectDeviceDialog.vue
index a0f721e..12cd563 100644
--- a/src/views/device/stateManage/components/selectDeviceDialog.vue
+++ b/src/views/device/stateManage/components/selectDeviceDialog.vue
@@ -22,7 +22,7 @@
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
@@ -131,7 +131,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="240"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
index 1cba55f..2f2e039 100644
--- a/src/views/business/lab/components/selectPrimitiveLogList.vue
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -29,7 +29,7 @@
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   offset: 1, // 当前页
-  limit: 5, // 每页多少条
+  limit: 20, // 每页多少条
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,7 +107,7 @@
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     offset: 1, // 当前页
-    limit: 5, // 每页多少条
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
@@ -212,7 +212,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 2eb7f48..97f94cc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -35,7 +35,7 @@
   sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -100,7 +100,7 @@
     sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -171,7 +171,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 6409759..3442fb8 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -11,7 +11,7 @@
   // certificationReportCode: string // 证书编号
   // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
-  approvalStatus: string // 审批状态-审批查询用
+  approvalStatus: string | null // 审批状态-审批查询用
   orderId: string // 委托书id
   formId: string // 审批用formId
   reason: string // 操作原因
@@ -53,6 +53,46 @@
   status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
 }
 
+// 证书详情副本
+export interface ICertDetail {
+  approvalStatus: string //
+  certificateReportCategory: string // 证书类别，多个逗号分割（字典code），检测报告等
+  certificateReportCode: string // 证书报告编号
+  certificateReportFile: string //
+  certificateReportName: string // 证书报告名称
+  certificateReportType: string // 证书类型，样品内部校验证书等
+  createTime: string //
+  createUser: string | number //
+  customerAddress: string //
+  customerEmail: string //
+  customerName: string //
+  customerNo: string //
+  customerPhone: string //
+  deliverer: string //
+  delivererId: string //
+  delivererTel: string //
+  id: string | number // 证书打印id
+  isDel: boolean //
+  measureContent: string // 检验项目
+  measureDeptId: string | number //
+  measurePersonId: string | number //
+  measureType: string // 校检类别
+  orderId: string | number //
+  originalRecordId: string | number // 原始记录id
+  originalRecordName: string // 原始记录名称
+  planDeliverTime: string //
+  printNum: string | number //
+  printStatus: string //
+  processId: string // 流程实例id
+  remark: string //
+  requireOverTime: string //
+  sampleId: string | number // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  signId: string // 电子签章id
+  templateId: string | number // 证书报告模板id
+}
+
 // 证书详情
 export interface ICertification {
   certificationId: string // 证书id
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 094078a..ffe7412 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -270,6 +270,31 @@
 const printCert = () => {
 
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -578,6 +603,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 35ae777..173b7ea 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -32,7 +32,7 @@
   sampleName: '', // 样品名称
   certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
-  approvalStatus: '', // 审批状态-审批查询用
+  approvalStatus: active.value, // 审批状态-审批查询用
   orderId: '', // 委托书id
   reason: '', // 操作原因
   sampleId: '', // 样品id
@@ -81,6 +81,12 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('certPrintActive')) {
+      active.value = window.sessionStorage.getItem('certPrintActive') as string
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
+    }
   })
 }
 
@@ -114,12 +120,12 @@
   const value = menu.value.find(item => item.name === activeTitle.value)!.id as string
   if (StatuFlag) {
     listQuery.value.printStatus = value as string
-    listQuery.value.approvalStatus = 'null'
+    listQuery.value.approvalStatus = null
   }
-  else {
-    listQuery.value.printStatus = ''
-    listQuery.value.approvalStatus = value as string == '0' ? 'null' : value as string
-  }
+  // else {
+  //   listQuery.value.printStatus = ''
+  //   listQuery.value.approvalStatus = value as string == '0' ? null : value as string
+  // }
 }
 
 // 数据查询
@@ -159,7 +165,7 @@
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: '', // 审批状态-审批查询用
+    approvalStatus: active.value, // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -173,7 +179,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -231,9 +237,6 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  console.log('oooooo')
-  console.log(row)
-
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -244,9 +247,6 @@
         type: 'warning',
       },
     ).then(() => {
-      console.log('-----------')
-
-      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
@@ -314,12 +314,6 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('certPrintActive') != null) {
-    active.value = window.sessionStorage.getItem('certPrintActive') as string
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
-  }
   fetchData(true)
 })
 </script>
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 79a112a..11d3092 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -26,7 +26,7 @@
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -85,7 +85,7 @@
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -156,7 +156,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index a343e18..d1e2598 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -30,7 +30,7 @@
   endTime: '', // 检定结束时间
   overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -94,7 +94,7 @@
     endTime: '', // 检定结束时间
     overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -165,7 +165,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       />
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 127fa61..5e11e43 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -22,7 +22,7 @@
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
@@ -131,7 +131,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="240"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 4b0f2c1..10d6a51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -39,6 +39,7 @@
 // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
+  applyUnit: '', // 申请部门
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyType: props.applyType, // 申请类型
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index ed415e0..c9f6db1 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -48,6 +48,7 @@
 
 // 查询条件类型
 export interface IlistQuery {
+  applyUnit: string // 申请部门
   applyNo: string // 申请编号
   applyStatus: string // 申请状态
   applyType: string // 申请类型
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
index 6d93818..ceb36c0 100644
--- a/src/views/device/stateManage/components/selectDevice.vue
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -11,7 +11,7 @@
 const listQuery = ref({
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
-  limit: 5,
+  limit: 20,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -87,7 +87,7 @@
   listQuery.value = {
     equipmentName: '', // 姓名
     equipmentNo: '', // 所在部门
-    limit: 5,
+    limit: 20,
     offset: 1,
   }
   search()
@@ -148,8 +148,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[20]"
         :list-loading="loadingTable" is-showmulti-select
+        :height="240"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/device/stateManage/components/selectDeviceDialog.vue b/src/views/device/stateManage/components/selectDeviceDialog.vue
index a0f721e..12cd563 100644
--- a/src/views/device/stateManage/components/selectDeviceDialog.vue
+++ b/src/views/device/stateManage/components/selectDeviceDialog.vue
@@ -22,7 +22,7 @@
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
@@ -131,7 +131,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="240"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index b9a50ef..42e3ed8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -819,10 +819,13 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
-              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
-              <el-button v-if="title !== '详情'" class="equipmentNo-item" type="default" @click="addRowBtn">
-                选择
-              </el-button>
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled>
+                <template v-if="title !== '详情'" #append>
+                  <el-button type="primary" size="small" @click="addRowBtn">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
index 1cba55f..2f2e039 100644
--- a/src/views/business/lab/components/selectPrimitiveLogList.vue
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -29,7 +29,7 @@
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   offset: 1, // 当前页
-  limit: 5, // 每页多少条
+  limit: 20, // 每页多少条
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,7 +107,7 @@
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     offset: 1, // 当前页
-    limit: 5, // 每页多少条
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
@@ -212,7 +212,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 2eb7f48..97f94cc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -35,7 +35,7 @@
   sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -100,7 +100,7 @@
     sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -171,7 +171,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 6409759..3442fb8 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -11,7 +11,7 @@
   // certificationReportCode: string // 证书编号
   // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
-  approvalStatus: string // 审批状态-审批查询用
+  approvalStatus: string | null // 审批状态-审批查询用
   orderId: string // 委托书id
   formId: string // 审批用formId
   reason: string // 操作原因
@@ -53,6 +53,46 @@
   status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
 }
 
+// 证书详情副本
+export interface ICertDetail {
+  approvalStatus: string //
+  certificateReportCategory: string // 证书类别，多个逗号分割（字典code），检测报告等
+  certificateReportCode: string // 证书报告编号
+  certificateReportFile: string //
+  certificateReportName: string // 证书报告名称
+  certificateReportType: string // 证书类型，样品内部校验证书等
+  createTime: string //
+  createUser: string | number //
+  customerAddress: string //
+  customerEmail: string //
+  customerName: string //
+  customerNo: string //
+  customerPhone: string //
+  deliverer: string //
+  delivererId: string //
+  delivererTel: string //
+  id: string | number // 证书打印id
+  isDel: boolean //
+  measureContent: string // 检验项目
+  measureDeptId: string | number //
+  measurePersonId: string | number //
+  measureType: string // 校检类别
+  orderId: string | number //
+  originalRecordId: string | number // 原始记录id
+  originalRecordName: string // 原始记录名称
+  planDeliverTime: string //
+  printNum: string | number //
+  printStatus: string //
+  processId: string // 流程实例id
+  remark: string //
+  requireOverTime: string //
+  sampleId: string | number // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  signId: string // 电子签章id
+  templateId: string | number // 证书报告模板id
+}
+
 // 证书详情
 export interface ICertification {
   certificationId: string // 证书id
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 094078a..ffe7412 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -270,6 +270,31 @@
 const printCert = () => {
 
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -578,6 +603,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 35ae777..173b7ea 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -32,7 +32,7 @@
   sampleName: '', // 样品名称
   certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
-  approvalStatus: '', // 审批状态-审批查询用
+  approvalStatus: active.value, // 审批状态-审批查询用
   orderId: '', // 委托书id
   reason: '', // 操作原因
   sampleId: '', // 样品id
@@ -81,6 +81,12 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('certPrintActive')) {
+      active.value = window.sessionStorage.getItem('certPrintActive') as string
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
+    }
   })
 }
 
@@ -114,12 +120,12 @@
   const value = menu.value.find(item => item.name === activeTitle.value)!.id as string
   if (StatuFlag) {
     listQuery.value.printStatus = value as string
-    listQuery.value.approvalStatus = 'null'
+    listQuery.value.approvalStatus = null
   }
-  else {
-    listQuery.value.printStatus = ''
-    listQuery.value.approvalStatus = value as string == '0' ? 'null' : value as string
-  }
+  // else {
+  //   listQuery.value.printStatus = ''
+  //   listQuery.value.approvalStatus = value as string == '0' ? null : value as string
+  // }
 }
 
 // 数据查询
@@ -159,7 +165,7 @@
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: '', // 审批状态-审批查询用
+    approvalStatus: active.value, // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -173,7 +179,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -231,9 +237,6 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  console.log('oooooo')
-  console.log(row)
-
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -244,9 +247,6 @@
         type: 'warning',
       },
     ).then(() => {
-      console.log('-----------')
-
-      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
@@ -314,12 +314,6 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('certPrintActive') != null) {
-    active.value = window.sessionStorage.getItem('certPrintActive') as string
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
-  }
   fetchData(true)
 })
 </script>
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 79a112a..11d3092 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -26,7 +26,7 @@
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -85,7 +85,7 @@
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -156,7 +156,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index a343e18..d1e2598 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -30,7 +30,7 @@
   endTime: '', // 检定结束时间
   overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -94,7 +94,7 @@
     endTime: '', // 检定结束时间
     overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -165,7 +165,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       />
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 127fa61..5e11e43 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -22,7 +22,7 @@
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
@@ -131,7 +131,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="240"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 4b0f2c1..10d6a51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -39,6 +39,7 @@
 // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
+  applyUnit: '', // 申请部门
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyType: props.applyType, // 申请类型
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index ed415e0..c9f6db1 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -48,6 +48,7 @@
 
 // 查询条件类型
 export interface IlistQuery {
+  applyUnit: string // 申请部门
   applyNo: string // 申请编号
   applyStatus: string // 申请状态
   applyType: string // 申请类型
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
index 6d93818..ceb36c0 100644
--- a/src/views/device/stateManage/components/selectDevice.vue
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -11,7 +11,7 @@
 const listQuery = ref({
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
-  limit: 5,
+  limit: 20,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -87,7 +87,7 @@
   listQuery.value = {
     equipmentName: '', // 姓名
     equipmentNo: '', // 所在部门
-    limit: 5,
+    limit: 20,
     offset: 1,
   }
   search()
@@ -148,8 +148,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[20]"
         :list-loading="loadingTable" is-showmulti-select
+        :height="240"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/device/stateManage/components/selectDeviceDialog.vue b/src/views/device/stateManage/components/selectDeviceDialog.vue
index a0f721e..12cd563 100644
--- a/src/views/device/stateManage/components/selectDeviceDialog.vue
+++ b/src/views/device/stateManage/components/selectDeviceDialog.vue
@@ -22,7 +22,7 @@
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
@@ -131,7 +131,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="240"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index b9a50ef..42e3ed8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -819,10 +819,13 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
-              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
-              <el-button v-if="title !== '详情'" class="equipmentNo-item" type="default" @click="addRowBtn">
-                选择
-              </el-button>
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled>
+                <template v-if="title !== '详情'" #append>
+                  <el-button type="primary" size="small" @click="addRowBtn">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
index 558fab9..46e460b 100644
--- a/src/views/measure/train/components/selectMeasurePersonDialog.vue
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -14,7 +14,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 20,
   offset: 1,
 })
 // 多选选中的内容
@@ -73,7 +73,7 @@
     staffNo: '',
     name: '', // 姓名
     deptId: '', // 所在部门
-    limit: 5,
+    limit: 20,
     offset: 1,
   }
   selectTreeRef.value.clearSelected()
@@ -145,7 +145,8 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >

diff --git a/src/api/business/lab/cert.ts b/src/api/business/lab/cert.ts
index 261cad3..2b0e682 100644
--- a/src/api/business/lab/cert.ts
+++ b/src/api/business/lab/cert.ts
@@ -49,3 +49,12 @@
     data,
   })
 }
+
+// 证书详情
+export function detail(data: object) {
+  return request({
+    url: '/business/certificatePrint/detail',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 81b49b4..0a08114 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -187,7 +187,7 @@
       ref="table"
       v-loading="listLoading"
       :data="data"
-      height="height"
+      :height="height"
       border
       stripe
       :size="size"
@@ -196,13 +196,13 @@
       @select="selectClick"
       @row-click="rowClick"
     >
-      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
-      <slot name="preColumns" />
-      <el-table-column v-if="!isMulti" label="" width="40" align="center" fixed>
+      <el-table-column v-if="!isMulti" label="" width="60" align="center" fixed>
         <template #default="scope">
           <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" @change="radioChange" />
         </template>
       </el-table-column>
+      <el-table-column v-if="isShowmultiSelect && isMulti" type="selection" width="38" fixed="left" />
+      <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" :fixed="column.fixed">
         <template #default="scope">
           <span v-if="!column.filter" :style="column.styleFilter ? column.styleFilter(scope.row) : ''">{{ scope.row[column.value] }}</span>
diff --git a/src/utils/buttonPerm.ts b/src/utils/buttonPerm.ts
index 8083780..a71d150 100644
--- a/src/utils/buttonPerm.ts
+++ b/src/utils/buttonPerm.ts
@@ -10,7 +10,7 @@
   agree: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批'
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -19,7 +19,7 @@
   reject: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 3
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 2].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
@@ -28,7 +28,7 @@
   refuse: {
     if: (row: any, permPath: string) => {
       error(permPath)
-      return hasPermission(permPath) && row.approvalStatusName === '待审批' && row.decisionItem !== 2
+      return hasPermission(permPath) && row.approvalStatusName === '待审批' && [1, 3].includes(row.decisionItem)
     },
     disabled: (row: any) => {
       return row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'
diff --git a/src/views/business/lab/components/sampleDialog.vue b/src/views/business/lab/components/sampleDialog.vue
index c9adca3..892c388 100644
--- a/src/views/business/lab/components/sampleDialog.vue
+++ b/src/views/business/lab/components/sampleDialog.vue
@@ -130,7 +130,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="5"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
index 6b11916..5dd199d 100644
--- a/src/views/business/lab/components/selectFiles.vue
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -28,7 +28,7 @@
   effectiveStartTime: '',
   publishEndTime: '',
   publishStartTime: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   fileType: '10', // 类型--10:计量规程
   ids: [] as string[],
@@ -96,7 +96,7 @@
     effectiveStartTime: '',
     publishEndTime: '',
     publishStartTime: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
     fileType: '10', // 类型--10:计量规程
     ids: [] as string[],
@@ -166,6 +166,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 54e382d..363dc7d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -32,7 +32,7 @@
   validStartDate: '', // 有效开始日期
   validEndDate: '', // 有效结束日期
   abc: '',
-  limit: 20,
+  limit: 5,
   offset: 1,
   // ids: [] as string[],
 })
@@ -111,7 +111,7 @@
     validStartDate: '', // 有效开始日期
     validEndDate: '', // 有效结束日期
     abc: '',
-    limit: 20,
+    limit: 5,
     offset: 1,
   // ids: [] as string[],
   }
@@ -176,6 +176,7 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
+        :page-sizes="[5]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
index 1cba55f..2f2e039 100644
--- a/src/views/business/lab/components/selectPrimitiveLogList.vue
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -29,7 +29,7 @@
   sampleName: '',	// 样品名称
   sampleNo: '',	// 样品编号
   offset: 1, // 当前页
-  limit: 5, // 每页多少条
+  limit: 20, // 每页多少条
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -107,7 +107,7 @@
     sampleName: '',	// 样品名称
     sampleNo: '',	// 样品编号
     offset: 1, // 当前页
-    limit: 5, // 每页多少条
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
@@ -212,7 +212,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
index 2eb7f48..97f94cc 100644
--- a/src/views/business/lab/components/selectSample.vue
+++ b/src/views/business/lab/components/selectSample.vue
@@ -35,7 +35,7 @@
   sampleNo: '',	// 样品编号
   customerId: '', // 委托方id
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -100,7 +100,7 @@
     sampleNo: '',	// 样品编号
     customerId: '', // 委托方id
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -171,7 +171,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="false"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="260"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index 6409759..3442fb8 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -11,7 +11,7 @@
   // certificationReportCode: string // 证书编号
   // certificateReportType: string // 证书类型
   printNum: number | '' // 打印次数 -未打印和全部用
-  approvalStatus: string // 审批状态-审批查询用
+  approvalStatus: string | null // 审批状态-审批查询用
   orderId: string // 委托书id
   formId: string // 审批用formId
   reason: string // 操作原因
@@ -53,6 +53,46 @@
   status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)
 }
 
+// 证书详情副本
+export interface ICertDetail {
+  approvalStatus: string //
+  certificateReportCategory: string // 证书类别，多个逗号分割（字典code），检测报告等
+  certificateReportCode: string // 证书报告编号
+  certificateReportFile: string //
+  certificateReportName: string // 证书报告名称
+  certificateReportType: string // 证书类型，样品内部校验证书等
+  createTime: string //
+  createUser: string | number //
+  customerAddress: string //
+  customerEmail: string //
+  customerName: string //
+  customerNo: string //
+  customerPhone: string //
+  deliverer: string //
+  delivererId: string //
+  delivererTel: string //
+  id: string | number // 证书打印id
+  isDel: boolean //
+  measureContent: string // 检验项目
+  measureDeptId: string | number //
+  measurePersonId: string | number //
+  measureType: string // 校检类别
+  orderId: string | number //
+  originalRecordId: string | number // 原始记录id
+  originalRecordName: string // 原始记录名称
+  planDeliverTime: string //
+  printNum: string | number //
+  printStatus: string //
+  processId: string // 流程实例id
+  remark: string //
+  requireOverTime: string //
+  sampleId: string | number // 样品id
+  sampleName: string // 样品名称
+  sampleNo: string // 样品编号
+  signId: string // 电子签章id
+  templateId: string | number // 证书报告模板id
+}
+
 // 证书详情
 export interface ICertification {
   certificationId: string // 证书id
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 094078a..ffe7412 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -270,6 +270,31 @@
 const printCert = () => {
 
 }
+
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
+      if (res.code === 200) {
+        dataForm.value.certificateReportFile = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -578,6 +603,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="证书报告附件:">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': dataForm.certificateReportFile === '' ? '0px' : '20px' }" @click="upload">
+                {{ dataForm.certificateReportFile === '' ? '上传' : '更换附件' }}
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index 35ae777..173b7ea 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -32,7 +32,7 @@
   sampleName: '', // 样品名称
   certificateClass: '', // 证书类型
   printNum: '', // 打印次数 -未打印和全部用
-  approvalStatus: '', // 审批状态-审批查询用
+  approvalStatus: active.value, // 审批状态-审批查询用
   orderId: '', // 委托书id
   reason: '', // 操作原因
   sampleId: '', // 样品id
@@ -81,6 +81,12 @@
         }
       }
     })
+    if (window.sessionStorage.getItem('certPrintActive')) {
+      active.value = window.sessionStorage.getItem('certPrintActive') as string
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
+    }
   })
 }
 
@@ -114,12 +120,12 @@
   const value = menu.value.find(item => item.name === activeTitle.value)!.id as string
   if (StatuFlag) {
     listQuery.value.printStatus = value as string
-    listQuery.value.approvalStatus = 'null'
+    listQuery.value.approvalStatus = null
   }
-  else {
-    listQuery.value.printStatus = ''
-    listQuery.value.approvalStatus = value as string == '0' ? 'null' : value as string
-  }
+  // else {
+  //   listQuery.value.printStatus = ''
+  //   listQuery.value.approvalStatus = value as string == '0' ? null : value as string
+  // }
 }
 
 // 数据查询
@@ -159,7 +165,7 @@
     sampleName: '', // 样品名称
     certificateClass: '', // 证书类型
     printNum: '', // 打印次数 -未打印和全部用
-    approvalStatus: '', // 审批状态-审批查询用
+    approvalStatus: active.value, // 审批状态-审批查询用
     orderId: '', // 委托书id
     reason: '', // 操作原因
     sampleId: '', // 样品id
@@ -173,7 +179,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}&id=${row.id}`)
 }
 
 // 点击分发， 弹窗
@@ -231,9 +237,6 @@
 // 打印
 const bindLabel = (row: ICerPrintList) => {
   // 判断状态第一次可以直接打印,之后的打印需要审批
-  console.log('oooooo')
-  console.log(row)
-
   if (row.printNum == 0) {
     ElMessageBox.confirm(
       '确定要打印吗？',
@@ -244,9 +247,6 @@
         type: 'warning',
       },
     ).then(() => {
-      console.log('-----------')
-
-      console.log(row)
       exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => {
         console.log(res)
       })
@@ -314,12 +314,6 @@
 
 onMounted(async () => {
   await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('certPrintActive') != null) {
-    active.value = window.sessionStorage.getItem('certPrintActive') as string
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '可打印')!.id as string// 可打印
-  }
   fetchData(true)
 })
 </script>
diff --git a/src/views/business/schedule/interchangeReceipt/selectSample.vue b/src/views/business/schedule/interchangeReceipt/selectSample.vue
index 79a112a..11d3092 100644
--- a/src/views/business/schedule/interchangeReceipt/selectSample.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectSample.vue
@@ -26,7 +26,7 @@
   sampleName: '', // 样品名称
   sampleNo: '', // 样品编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -85,7 +85,7 @@
     sampleName: '', // 样品名称
     sampleNo: '', // 样品编号
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -156,7 +156,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue
index a343e18..d1e2598 100644
--- a/src/views/business/schedule/order/selectSample.vue
+++ b/src/views/business/schedule/order/selectSample.vue
@@ -30,7 +30,7 @@
   endTime: '', // 检定结束时间
   overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 // 表头
 const columns = ref<TableColumn[]>([
@@ -94,7 +94,7 @@
     endTime: '', // 检定结束时间
     overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期
     offset: 1,
-    limit: 5,
+    limit: 20,
   }
   fetchData(true)
 }
@@ -165,7 +165,8 @@
         :list-loading="loadingTable"
         is-showmulti-select
         :is-multi="true"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       />
diff --git a/src/views/device/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 127fa61..5e11e43 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -22,7 +22,7 @@
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
@@ -131,7 +131,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="240"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 4b0f2c1..10d6a51 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -39,6 +39,7 @@
 // 关闭
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
+  applyUnit: '', // 申请部门
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
   applyType: props.applyType, // 申请类型
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index ed415e0..c9f6db1 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -48,6 +48,7 @@
 
 // 查询条件类型
 export interface IlistQuery {
+  applyUnit: string // 申请部门
   applyNo: string // 申请编号
   applyStatus: string // 申请状态
   applyType: string // 申请类型
diff --git a/src/views/device/stateManage/components/selectDevice.vue b/src/views/device/stateManage/components/selectDevice.vue
index 6d93818..ceb36c0 100644
--- a/src/views/device/stateManage/components/selectDevice.vue
+++ b/src/views/device/stateManage/components/selectDevice.vue
@@ -11,7 +11,7 @@
 const listQuery = ref({
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
-  limit: 5,
+  limit: 20,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -87,7 +87,7 @@
   listQuery.value = {
     equipmentName: '', // 姓名
     equipmentNo: '', // 所在部门
-    limit: 5,
+    limit: 20,
     offset: 1,
   }
   search()
@@ -148,8 +148,9 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5]"
+        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[20]"
         :list-loading="loadingTable" is-showmulti-select
+        :height="240"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/device/stateManage/components/selectDeviceDialog.vue b/src/views/device/stateManage/components/selectDeviceDialog.vue
index a0f721e..12cd563 100644
--- a/src/views/device/stateManage/components/selectDeviceDialog.vue
+++ b/src/views/device/stateManage/components/selectDeviceDialog.vue
@@ -22,7 +22,7 @@
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   offset: 1,
-  limit: 5,
+  limit: 20,
 })
 const total = ref(20)
 // 多选选中的内容
@@ -131,7 +131,8 @@
         :is-multi="isMulti"
         is-showmulti-select
         :list-loading="loadingTable"
-        :page-sizes="[5]"
+        :page-sizes="[20]"
+        :height="240"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index b9a50ef..42e3ed8 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -819,10 +819,13 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
-              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
-              <el-button v-if="title !== '详情'" class="equipmentNo-item" type="default" @click="addRowBtn">
-                选择
-              </el-button>
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled>
+                <template v-if="title !== '详情'" #append>
+                  <el-button type="primary" size="small" @click="addRowBtn">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
index 558fab9..46e460b 100644
--- a/src/views/measure/train/components/selectMeasurePersonDialog.vue
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -14,7 +14,7 @@
   staffNo: '', // 人员编号
   name: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 20,
   offset: 1,
 })
 // 多选选中的内容
@@ -73,7 +73,7 @@
     staffNo: '',
     name: '', // 姓名
     deptId: '', // 所在部门
-    limit: 5,
+    limit: 20,
     offset: 1,
   }
   selectTreeRef.value.clearSelected()
@@ -145,7 +145,8 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :is-multi="false"
-        :page-sizes="[5]"
+        :height="260"
+        :page-sizes="[20]"
         @change="changePage"
         @multiSelect="handleSelectionChange"
       >
diff --git a/src/views/system/tool/userList.vue b/src/views/system/tool/userList.vue
index fe66aa4..610fbc6 100644
--- a/src/views/system/tool/userList.vue
+++ b/src/views/system/tool/userList.vue
@@ -14,7 +14,7 @@
 const listQuery = ref({
   keywords: '', // 姓名
   deptId: '', // 所在部门
-  limit: 5,
+  limit: 20,
   offset: 1,
 })
 const loadingTable = ref<boolean>(false)
@@ -58,7 +58,7 @@
   listQuery.value = {
     keywords: '', // 姓名
     deptId: '', // 所在部门
-    limit: 5,
+    limit: 20,
     offset: 1,
   }
   selectTreeRef.value.clearSelected()
@@ -127,7 +127,7 @@
     <div style="padding: 12px;">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :is-multi="true" :page-sizes="[5]"
+        :list-loading="loadingTable" :is-multi="true" :page-sizes="[20]" :height="240"
         :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>